Merge branch 'firstdeploy'
authorBernhard Urban <lewurm@gmail.com>
Sat, 8 Jan 2011 14:15:23 +0000 (15:15 +0100)
committerBernhard Urban <lewurm@gmail.com>
Sat, 8 Jan 2011 14:15:23 +0000 (15:15 +0100)

Trivial merge