merge
authorNajlaa <nel@silver>
Thu, 30 Oct 2008 14:58:36 +0000 (15:58 +0100)
committerNajlaa <nel@silver>
Thu, 30 Oct 2008 14:58:36 +0000 (15:58 +0100)
bzr revid: nel@silver-20081030145836-qlb6it8sdl2ev50l


Trivial merge