[master] Merge branch 'trac2252'

author Naoki Kambe <kambe@jprs.co.jp>

Tue, 7 May 2013 01:48:55 +0000 (10:48 +0900)

committer Naoki Kambe <kambe@jprs.co.jp>

Tue, 7 May 2013 01:49:19 +0000 (10:49 +0900)
author Naoki Kambe <kambe@jprs.co.jp>
Tue, 7 May 2013 01:48:55 +0000 (10:48 +0900)
committer Naoki Kambe <kambe@jprs.co.jp>
Tue, 7 May 2013 01:49:19 +0000 (10:49 +0900)
diff --cc tests/lettuce/features/terrain/bind10_control.py
Simple merge
author	Naoki Kambe <kambe@jprs.co.jp>
	Tue, 7 May 2013 01:48:55 +0000 (10:48 +0900)
committer	Naoki Kambe <kambe@jprs.co.jp>
	Tue, 7 May 2013 01:49:19 +0000 (10:49 +0900)