m1
v1
m2: Squashed commit of the following:

commit 9889703e34b6803ccc5a3298ff168c4c6d50a28a
Author: Hiroki Horiuchi <x19290@gmail.com>
Date:   Mon Jan 6 15:57:15 2014 +0900

    v1
m2: Merge branch 'volatile'