Merge.
authordl-taktik <dl@taktik.be>
Wed, 22 May 2013 07:57:26 +0000 (09:57 +0200)
committerdl-taktik <dl@taktik.be>
Wed, 22 May 2013 07:57:26 +0000 (09:57 +0200)
bzr revid: dl@taktik.be-20130522075726-hj5gnvp27381jvlm


Trivial merge