Code

Merge branch 'upstream'
authorSebastian Harl <sh@tokkee.org>
Fri, 25 Jul 2008 09:21:54 +0000 (11:21 +0200)
committerSebastian Harl <sh@tokkee.org>
Fri, 25 Jul 2008 09:21:54 +0000 (11:21 +0200)

Trivial merge