Merge branch 'master' of git://github.com/skinner33/testub10
authorBernhard Urban <lewurm@gmail.com>
Wed, 19 May 2010 20:38:11 +0000 (22:38 +0200)
committerBernhard Urban <lewurm@gmail.com>
Wed, 19 May 2010 20:38:11 +0000 (22:38 +0200)

Trivial merge