Merge branch 'master' of git://github.com/skinner33/testub10
authorBernhard Urban <lewurm@gmail.com>
Tue, 23 Mar 2010 01:25:38 +0000 (02:25 +0100)
committerBernhard Urban <lewurm@gmail.com>
Tue, 23 Mar 2010 01:25:38 +0000 (02:25 +0100)

Trivial merge