Code

Merge branch 'upstream' into experimental
authorSebastian Harl <sh@tokkee.org>
Tue, 9 Jun 2009 16:16:48 +0000 (18:16 +0200)
committerSebastian Harl <sh@tokkee.org>
Tue, 9 Jun 2009 16:16:48 +0000 (18:16 +0200)

Trivial merge