Code

Merge branch 'upstream-1.3' into experimental
authorSebastian Harl <sh@tokkee.org>
Sun, 8 Jun 2008 17:42:22 +0000 (19:42 +0200)
committerSebastian Harl <sh@tokkee.org>
Sun, 8 Jun 2008 17:42:22 +0000 (19:42 +0200)

Trivial merge