Merge remote-tracking branch 'upstream/master' into fix-for-issue2907-with-no-formatt...
authorNicolas Raoul <nicolas.raoul@gmail.com>
Tue, 6 Nov 2012 01:12:27 +0000 (10:12 +0900)
committerNicolas Raoul <nicolas.raoul@gmail.com>
Tue, 6 Nov 2012 01:12:27 +0000 (10:12 +0900)

Trivial merge