[MERGE]Merged with trunk
authorDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 27 Feb 2013 09:27:46 +0000 (14:57 +0530)
committerDharti Ratani (Open ERP) <dhr@tinyerp.com>
Wed, 27 Feb 2013 09:27:46 +0000 (14:57 +0530)
commit1b4ed8b5e1f6215e30d1d5398a02d9b67a5bc32f
tree49375d015d77e75768cc3802c7124c817e4d0b6b
parente765fe1ebdacf30f902e52fca3f9999a83b62840
parent675b8eb1dcf91460703fab8af7593256b18d8244
[MERGE]Merged with trunk

bzr revid: dhr@tinyerp.com-20130227092746-3tpmuy0v3o32wt6y