Manually merge r84187

This commit is contained in:
Éric Araujo 2010-08-18 22:42:07 +00:00
parent a9d7c7772f
commit 790c9af79e