merge (again)
authorNajlaa <nel@silver>
Tue, 4 Nov 2008 10:57:52 +0000 (11:57 +0100)
committerNajlaa <nel@silver>
Tue, 4 Nov 2008 10:57:52 +0000 (11:57 +0100)
bzr revid: nel@silver-20081104105752-ups5lkz6zlcjlelr


Trivial merge