Merge remote-tracking branch 'origin/next' into next
authorHideki Saito <hidekis@gmail.com>
Sat, 22 Dec 2012 05:23:57 +0000 (21:23 -0800)
committerHideki Saito <hidekis@gmail.com>
Sat, 22 Dec 2012 05:23:57 +0000 (21:23 -0800)

Trivial merge