[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)
bzr revid: niels@bubbles-it.be-20090903135830-h3lsipjelgm2hp80


Trivial merge