Code

Merge branch 'upstream'
authorSebastian Harl <sh@tokkee.org>
Mon, 1 Jun 2009 10:23:55 +0000 (12:23 +0200)
committerSebastian Harl <sh@tokkee.org>
Mon, 1 Jun 2009 10:23:55 +0000 (12:23 +0200)

Trivial merge