[MERGE]
authorNiels Huylebroeck <niels@bubbles-it.be>
Thu, 3 Sep 2009 13:58:30 +0000 (15:58 +0200)
committerNiels Huylebroeck <niels@bubbles-it.be>
Thu, 3 Sep 2009 13:58:30 +0000 (15:58 +0200)
commit1bafef884a52037d416081de7517efd036e9940c
tree0f310ec484ed919857148ea982726f787b97505e
parent49d05c86b239993504738e0a90847120f8993bde
parent8830155b50cea945a820d0631d41cbde04c6f8aa
[MERGE]

bzr revid: niels@bubbles-it.be-20090903135830-h3lsipjelgm2hp80