[MERGE] Merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Thu, 26 Aug 2010 03:43:50 +0000 (09:13 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Thu, 26 Aug 2010 03:43:50 +0000 (09:13 +0530)
bzr revid: mra@mra-laptop-20100826034350-8pix5nbxpc750xfn


Trivial merge