test for bzr merge
authorgian <gian@li82-39>
Wed, 21 Oct 2009 12:51:06 +0000 (14:51 +0200)
committergian <gian@li82-39>
Wed, 21 Oct 2009 12:51:06 +0000 (14:51 +0200)

Trivial merge