merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 24 Sep 2011 09:12:51 +0000 (11:12 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 24 Sep 2011 09:12:51 +0000 (11:12 +0200)
commitcd9c305dba4994426f5d4c091923c47803e48b1d
treeaf785c03b99dba4045c8d5d4c947527a11198fe8
parentc3a79fbc365489d854e5d6ad0a2e8f92bc5f194a
parent88de9bfec9c241a76316114bf4a8a6266a134fca
merge

lp bug: https://launchpad.net/bugs/855464 fixed

bzr revid: fp@tinyerp.com-20110924091251-4zb4pnczdplflv3l