Merge remote-tracking branch 'mainline/master' into earth
authorOlivier Goffart <olivier.goffart@nokia.com>
Fri, 6 May 2011 07:54:24 +0000 (09:54 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Fri, 6 May 2011 07:54:24 +0000 (09:54 +0200)

Trivial merge