Merge branch 'upstream'
authorSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:24:13 +0000 (16:24 +0100)
committerSven Hoexter <sven@stormbind.net>
Mon, 17 Jan 2011 15:24:13 +0000 (16:24 +0100)

Trivial merge