Merge branch 'master' of space.twc.de:/public/git/jacksampler
authorStefan Westerfeld <stefan@space.twc.de>
Fri, 25 Jun 2010 17:29:51 +0000 (19:29 +0200)
committerStefan Westerfeld <stefan@space.twc.de>
Fri, 25 Jun 2010 17:29:51 +0000 (19:29 +0200)

Trivial merge