Code

Merge branch 'upstream-1.4' into experimental
authorSebastian Harl <sh@tokkee.org>
Wed, 30 Sep 2009 19:35:49 +0000 (21:35 +0200)
committerSebastian Harl <sh@tokkee.org>
Wed, 30 Sep 2009 19:35:49 +0000 (21:35 +0200)

Trivial merge