[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Mon, 31 Jan 2011 12:49:56 +0000 (18:19 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Mon, 31 Jan 2011 12:49:56 +0000 (18:19 +0530)
bzr revid: mra@mra-laptop-20110131124956-bjsyzn9qfo91mjd9


Trivial merge