tree c0378e7b8965936a4007d26835fa615692dababf
parent d1a0d4739cfadc71ef01c00ff6cb3f3bdacd5a38
author Yuta HIGUCHI <y-higuchi@onlab.us> 1390583679 -0800
committer Yuta HIGUCHI <y-higuchi@onlab.us> 1390583679 -0800

Fix merge error