[MERGE] merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Sat, 3 Jul 2010 07:03:03 +0000 (12:33 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Sat, 3 Jul 2010 07:03:03 +0000 (12:33 +0530)
bzr revid: mra@mra-laptop-20100702144735-1yb06k05686ob3pw
bzr revid: mra@mra-laptop-20100703070303-m9v6wh3jhd440u9e


Trivial merge