Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 11 Mar 2014 23:09:20 +0000 (00:09 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 11 Mar 2014 23:09:20 +0000 (00:09 +0100)

Trivial merge