[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Wed, 29 Sep 2010 09:50:36 +0000 (15:20 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 29 Sep 2010 09:50:36 +0000 (15:20 +0530)
commitf493a19df2e53abb62df922dfec152b82fc42176
tree1df2b8b94dfd9e6256010d98b648f6b0c58cdc5e
parent3750db76b595c7d880580965769a0fe56a91923e
parent7f5e2da3d42fcb90bd765ad2042cb6c21b992772
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20100929095036-ncu5js3idn7n4g5z