merge
authorThomasV <thomasv@gitorious>
Sun, 29 Apr 2012 16:43:11 +0000 (18:43 +0200)
committerThomasV <thomasv@gitorious>
Sun, 29 Apr 2012 16:43:11 +0000 (18:43 +0200)

Trivial merge