merge
authorNajlaa <nel@silver>
Fri, 10 Oct 2008 13:22:51 +0000 (15:22 +0200)
committerNajlaa <nel@silver>
Fri, 10 Oct 2008 13:22:51 +0000 (15:22 +0200)
commitf309613656a45fb4856dea143bc9cf1268398496
tree5afc9879a463793351d62652c4be24fe8b6779c9
parent70a49373cb109a97462464b346ca9fe8337929ee
parent430b794aac1ea7c5cb56b19a06fa71508c646cd0
merge

bzr revid: nel@silver-20081010132251-ldtw27eudo35oaaw