[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Thu, 25 Nov 2010 03:48:22 +0000 (09:18 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Thu, 25 Nov 2010 03:48:22 +0000 (09:18 +0530)
bzr revid: mra@mra-laptop-20101125034822-r21kr93zgkhu9gto


Trivial merge