Code

Merge branch 'upstream-1.3' into experimental
authorSebastian Harl <sh@tokkee.org>
Thu, 12 Jun 2008 21:19:40 +0000 (23:19 +0200)
committerSebastian Harl <sh@tokkee.org>
Thu, 12 Jun 2008 21:19:40 +0000 (23:19 +0200)

Trivial merge