[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 26 Oct 2010 13:18:31 +0000 (18:48 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 26 Oct 2010 13:18:31 +0000 (18:48 +0530)
bzr revid: mra@mra-laptop-20101026131831-rygvcicz3vi3hk39


Trivial merge