[MERGE] merge with trunk
authorMustufa Rangwala <mra@mra-laptop>
Wed, 9 Jun 2010 13:26:46 +0000 (18:56 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 9 Jun 2010 13:26:46 +0000 (18:56 +0530)
commitb54cc4ea34c0b76d5613f901f06caa368d0aec06
tree5194c1046b43e9cb1df6fc8c0094713ccc1223f1
parent9148775b6ee3713a0a74bf4bae29898b3894be54
parent30e2cb4f5ade8c7821c720978c07c38780963631
[MERGE] merge with trunk

bzr revid: mra@mra-laptop-20100609132646-j7krm6i1ikrrz2rn