[jd/f18: 3/3] Merge remote-tracking branch 'origin/master' into f18

[Mamoru Tasaka]

commit d78f5c2a6738847e91a9e161471249b4151a3617
Merge: c7ea2b3 0c93ca0
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Dec 16 23:04:47 2012 +0900

    Merge remote-tracking branch 'origin/master' into f18

---