[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Wed, 6 Oct 2010 12:51:31 +0000 (18:21 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 6 Oct 2010 12:51:31 +0000 (18:21 +0530)
bzr revid: mra@mra-laptop-20101006125131-8xf4r5tz49dkf6g3


Trivial merge