Merge remote-tracking branch 'origin/master' into HEAD
authorEdward Hervey <edward.hervey@collabora.co.uk>
Tue, 2 Aug 2011 09:26:45 +0000 (11:26 +0200)
committerEdward Hervey <edward.hervey@collabora.co.uk>
Tue, 2 Aug 2011 09:26:45 +0000 (11:26 +0200)

Trivial merge