Merge branch 'master' of linz:/srv/git/themes
authorRobert Kaiser <robert@notebook.box.kairo.at>
Fri, 2 Dec 2011 23:22:06 +0000 (00:22 +0100)
committerRobert Kaiser <robert@notebook.box.kairo.at>
Fri, 2 Dec 2011 23:22:06 +0000 (00:22 +0100)

Trivial merge