[MERGE] with trunk
authorDharmraj Zala (OpenERP Trainee) <dizzy.zala@gmail.com>
Tue, 27 Aug 2013 13:24:38 +0000 (18:54 +0530)
committerDharmraj Zala (OpenERP Trainee) <dizzy.zala@gmail.com>
Tue, 27 Aug 2013 13:24:38 +0000 (18:54 +0530)
bzr revid: dizzy.zala@gmail.com-20130827132438-mz4tvrx3vchosm94


Trivial merge