merge
authorNajlaa <nel@silver>
Fri, 26 Sep 2008 13:24:11 +0000 (15:24 +0200)
committerNajlaa <nel@silver>
Fri, 26 Sep 2008 13:24:11 +0000 (15:24 +0200)
bzr revid: nel@silver-20080926132411-2vpxbtc9pxgtfpqe


Trivial merge