Merge from open-source master

This commit is contained in:
Jean-Baptiste Queru 2010-02-11 11:03:01 -08:00
commit 4468682c70

Diff content is not available