Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 18 Oct 2011 12:32:05 +0000 (14:32 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 18 Oct 2011 12:32:05 +0000 (14:32 +0200)
commiteffab293cbf478135bd7bb7966cad9bd0727ddf0
tree7c87ac4b92dbabbfc08ba6fcaebc087069b8109a
parent9195c33d36886a9dc5485a5eaebe0b5f7b913316
parent73d847ba24792ca2143c738b716b948e55ad193b
Merge branch 'master' into 0.11