Code

Merge branch 'upstream'
authorSebastian Harl <sh@tokkee.org>
Wed, 23 Jul 2008 17:57:48 +0000 (19:57 +0200)
committerSebastian Harl <sh@tokkee.org>
Wed, 23 Jul 2008 17:57:48 +0000 (19:57 +0200)

Trivial merge