[MERGE]merge with trunk addons
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Thu, 21 Jun 2012 06:15:38 +0000 (11:45 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Thu, 21 Jun 2012 06:15:38 +0000 (11:45 +0530)
commit66c48b1a875209fe0cfaf706f505651d5b209324
treefa82b024b2e3c47ad3e67325f48a028108594a53
parent7ad658375fd805497e4d9e0ff318cb65a7c1abed
parent6e30c1323dc08e589481ea481ef33a4e8106eee4
[MERGE]merge with trunk addons

bzr revid: sgo@tinyerp.com-20120621061538-9duh993cp61psz2u