e824ccb Updates from upstream git.

Merged and Committed by tagoh 13 years ago
file modified
+5 -2