Merge remote-tracking branch 'upstream/master'
authorPontius <pontius@pdmc.net>
Fri, 4 Jan 2013 06:57:14 +0000 (07:57 +0100)
committerPontius <pontius@pdmc.net>
Fri, 4 Jan 2013 06:57:14 +0000 (07:57 +0100)

Trivial merge