Merge remote branch 'origin/master' into haswell
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 15:50:18 +0000 (16:50 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 15:50:18 +0000 (16:50 +0100)

Trivial merge