Merge remote-tracking branch 'origin/master'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 6 Apr 2013 16:39:10 +0000 (18:39 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 6 Apr 2013 16:39:10 +0000 (18:39 +0200)

Trivial merge