merge upstream
authorChristophe Simonis <chs@openerp.com>
Thu, 29 Nov 2012 15:21:03 +0000 (16:21 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 29 Nov 2012 15:21:03 +0000 (16:21 +0100)
commit4622172c81cedaec26b5e87eacc6e3f005e94831
tree175b2035be53813290140285471eca7ae0953ce6
parent4d91b6a87c9fd6f8cc923d1bc375eb80db5dbec3
parent64c486e59f1b093bfbf1461b7462b7fccafdcd05
merge upstream

bzr revid: chs@openerp.com-20121129152103-e7w590lynz4veqn9