[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Thu, 9 Dec 2010 04:09:22 +0000 (09:39 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Thu, 9 Dec 2010 04:09:22 +0000 (09:39 +0530)
commit3f8fdeafb8e3fb2126a8ae4437a3d13a75538419
tree8ac708ce0ebef9ce094befd51ccbe82ab70df61c
parent3c7f02cd6975d20562d11674fc6828537e811ebf
parent9bac691edbe24ceda8565775a9fefc4fe8760946
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101209040922-wif5k5mosyb0289q