From: gian <gian@li82-39>
Date: Wed, 21 Oct 2009 12:51:06 +0000 (+0200)
Subject: test for bzr merge
X-Git-Tag: 1.0.0~59^2~11^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e235351d68715d0b232d48c21974ef6a89bb685;p=be.git

test for bzr merge
---

2e235351d68715d0b232d48c21974ef6a89bb685