merge from open-source master

This commit is contained in:
Jean-Baptiste Queru 2009-08-04 09:00:15 -07:00
commit 0cf0e33b5f

Diff content is not available