[MERGE] merge with team1 branch
authorSbh (OpenERP) <sbh@tinyerp.com>
Thu, 23 Dec 2010 04:23:57 +0000 (09:53 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Thu, 23 Dec 2010 04:23:57 +0000 (09:53 +0530)
commite642d547c781876bb206878b6d83d5f61b08b03f
tree08a7176ccdd956fde458019fd8146a7fa4e0a989
parentb3241b1d61b300480f847a64da7d6c63d581588e
parent7d1a4cb28d6754ec55579c168be612dfe3c6311b
[MERGE] merge with team1 branch

bzr revid: sbh@tinyerp.com-20101223042357-y5gu7nyglvcqhsbd