[MERGE] merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Wed, 30 Jun 2010 03:54:50 +0000 (09:24 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 30 Jun 2010 03:54:50 +0000 (09:24 +0530)
bzr revid: mra@mra-laptop-20100630035450-i1te250tnvoczgjj


Trivial merge