Merge remote branch 'jweyrich/master'
authorMichael Elsdoerfer <michael@elsdoerfer.com>
Mon, 22 Nov 2010 15:01:00 +0000 (16:01 +0100)
committerMichael Elsdoerfer <michael@elsdoerfer.com>
Mon, 22 Nov 2010 15:01:00 +0000 (16:01 +0100)

Trivial merge