[MERGE] Merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 31 Aug 2010 03:18:50 +0000 (08:48 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 31 Aug 2010 03:18:50 +0000 (08:48 +0530)
commit8ac24de38c052eef2546bdd6b24ea1386ddebbc8
tree2142db1f0f58bb513c9d964129f8b7085bd31d08
parentb8a0e61af3503b6036669376c1d2271c6f45d312
parent22fb8bcb3d659320c8804bac2c9b2c034eb0db34
[MERGE] Merge with trunk addons

bzr revid: mra@mra-laptop-20100831031850-o1jicmy702cy43ne