Merge branch 'master' of git://github.com/skinner33/testub10
authorBernhard Urban <lewurm@gmail.com>
Mon, 17 May 2010 17:46:23 +0000 (19:46 +0200)
committerBernhard Urban <lewurm@gmail.com>
Mon, 17 May 2010 17:46:23 +0000 (19:46 +0200)

Trivial merge