Code

Merge branch 'upstream'
authorSebastian Harl <sh@tokkee.org>
Tue, 7 Apr 2009 12:41:47 +0000 (14:41 +0200)
committerSebastian Harl <sh@tokkee.org>
Tue, 7 Apr 2009 12:41:47 +0000 (14:41 +0200)

Trivial merge