From 42286f8b06626623812b8c7a9497119918bd945d Mon Sep 17 00:00:00 2001
From: Akiko Takano <akiko.pusu@gmail.com>
Date: Wed, 11 Apr 2012 09:38:31 +0900
Subject: [PATCH] Merge branches 'dev' and 'master'