Merge branch 'master' into part-to-stream-in-plugins
authorJose Dapena Paz <jdapena@igalia.com>
Mon, 31 Aug 2009 10:39:55 +0000 (12:39 +0200)
committerJose Dapena Paz <jdapena@igalia.com>
Mon, 31 Aug 2009 10:39:55 +0000 (12:39 +0200)

Trivial merge