merge from open-source master

This commit is contained in:
Jean-Baptiste Queru 2009-11-15 14:55:27 -08:00
commit b609517258

Diff content is not available