Merge remote-tracking branch 'dcoppa/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 1 Feb 2013 17:05:42 +0000 (18:05 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 1 Feb 2013 17:05:42 +0000 (18:05 +0100)

Trivial merge