tree dc5dc68a59aa8c09f1732f6a46011ab1cdc0a8f1
parent cc43b7e9271a45f51a16cc0213845a862bcf5ed1
parent 33ee4a79737a59fc54e801db85309f4d9bbc6119
author Rushabh Mehta <rmehta@gmail.com> 1328272563 +0100
committer Rushabh Mehta <rmehta@gmail.com> 1328272563 +0100

Merge branch 'stable' into latest