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)
commit011fac630357428e59d7eae29888d905255c9580
tree27e455153185620db2111c026977f7ed0d8754dd
parentc3b0f06479bf273c47cb33fed18a07dafc25c54b
parent82a7f4808029ffb00a154ced9672071aa1376818
Merge branch 'master' into part-to-stream-in-plugins