Merge branch 'master' into part-to-stream-in-plugins
authorJose Dapena Paz <jdapena@igalia.com>
Tue, 25 Aug 2009 14:24:09 +0000 (16:24 +0200)
committerJose Dapena Paz <jdapena@igalia.com>
Tue, 25 Aug 2009 14:24:09 +0000 (16:24 +0200)

Trivial merge