merge from open-source master

This commit is contained in:
Jean-Baptiste Queru 2009-08-04 09:00:31 -07:00
commit aa027b4668

Diff content is not available