Merge branch 'master' into ppc
authorBernhard Urban <lewurm@gmail.com>
Wed, 9 Jun 2010 21:29:49 +0000 (23:29 +0200)
committerBernhard Urban <lewurm@gmail.com>
Wed, 9 Jun 2010 21:29:49 +0000 (23:29 +0200)

Trivial merge