Merge remote-tracking branch 'upstream/master'
authormatthiaskrgr <matthias.krueger@famsik.de>
Fri, 28 Dec 2012 22:33:43 +0000 (23:33 +0100)
committermatthiaskrgr <matthias.krueger@famsik.de>
Fri, 28 Dec 2012 22:33:43 +0000 (23:33 +0100)

Trivial merge