[MERGE] merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Wed, 7 Jul 2010 04:01:26 +0000 (09:31 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 7 Jul 2010 04:01:26 +0000 (09:31 +0530)
bzr revid: mra@mra-laptop-20100706121435-65d85ikqs1z0iaez
bzr revid: mra@mra-laptop-20100706132313-n733lghx6w75knjj
bzr revid: mra@mra-laptop-20100706135232-ibsx20ve27kkv6q1
bzr revid: mra@mra-laptop-20100707040126-qosc5js2z00wkkmm


Trivial merge