Merge branch 'master' of git://github.com/skinner33/testub10
authorBernhard Urban <lewurm@gmail.com>
Wed, 31 Mar 2010 14:19:16 +0000 (16:19 +0200)
committerBernhard Urban <lewurm@gmail.com>
Wed, 31 Mar 2010 14:19:16 +0000 (16:19 +0200)

Trivial merge