Merge branch 'upstream'
authorSebastian Goth <seezer@roath.org>
Thu, 26 Jun 2008 21:00:37 +0000 (23:00 +0200)
committerSebastian Goth <seezer@roath.org>
Thu, 26 Jun 2008 21:00:37 +0000 (23:00 +0200)

Trivial merge