[Merge] Merged with trunk.
authorDJ Patel <mdi@tinyerp.com>
Tue, 8 Apr 2014 04:27:21 +0000 (09:57 +0530)
committerDJ Patel <mdi@tinyerp.com>
Tue, 8 Apr 2014 04:27:21 +0000 (09:57 +0530)
bzr revid: mdi@tinyerp.com-20140408042721-cc9ujr6abdpnwxqg


Trivial merge