Merge remote-tracking branch 'origin' into next
authorHideki Saito <hidekis@gmail.com>
Tue, 18 Dec 2012 11:38:20 +0000 (03:38 -0800)
committerHideki Saito <hidekis@gmail.com>
Tue, 18 Dec 2012 11:38:20 +0000 (03:38 -0800)

Trivial merge