[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)
bzr revid: mra@mra-laptop-20100609132646-j7krm6i1ikrrz2rn


Trivial merge