tree a38741781dd800c8b808c4a1ddce91e1aa15fd5e
parent dad0a2d047d8d521379004dc3f482586fcdabbc5
author Yuta HIGUCHI <y-higuchi@onlab.us> 1389053573 -0800
committer Yuta HIGUCHI <y-higuchi@onlab.us> 1389053573 -0800

Fix merge error