Merge remote-tracking branch 'upstream/master'
authorMartin Schmölzer <martin@schmoelzer.at>
Tue, 8 Jan 2013 08:53:40 +0000 (09:53 +0100)
committerMartin Schmölzer <martin@schmoelzer.at>
Tue, 8 Jan 2013 08:53:40 +0000 (09:53 +0100)

Trivial merge