merge from open-source master

This commit is contained in:
Jean-Baptiste Queru 2009-12-21 15:31:49 -08:00
commit 158657bc5c

Diff content is not available