Merge branch 'master' of git://github.com/bschussek/testub10
authorBernhard Urban <lewurm@gmail.com>
Tue, 27 Apr 2010 10:41:07 +0000 (12:41 +0200)
committerBernhard Urban <lewurm@gmail.com>
Tue, 27 Apr 2010 10:41:07 +0000 (12:41 +0200)

Trivial merge