[MERGE] Merge with main branch
authorMustufa Rangwala <mra@mra-laptop>
Fri, 30 Jul 2010 09:45:54 +0000 (15:15 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Fri, 30 Jul 2010 09:45:54 +0000 (15:15 +0530)
bzr revid: mra@mra-laptop-20100730094554-znlpi4w7l1v5qaw4


Trivial merge