Merge remote-tracking branch 'upstream/master'
authorAndreas Gerstmayr <andreas@andreasgerstmayr.at>
Sun, 18 Mar 2012 16:12:48 +0000 (17:12 +0100)
committerAndreas Gerstmayr <andreas@andreasgerstmayr.at>
Sun, 18 Mar 2012 16:12:48 +0000 (17:12 +0100)

Trivial merge