Merge branch 'dev' of ssh://raid.local.hde.co.jp/hde/karesansui/karesansui into dev

author keisuke fukawa <keisuke@karesansui-project.info>

Thu, 13 May 2010 08:52:34 +0000 (17:52 +0900)

committer keisuke fukawa <keisuke@karesansui-project.info>

Thu, 13 May 2010 08:52:34 +0000 (17:52 +0900)
author keisuke fukawa <keisuke@karesansui-project.info>
Thu, 13 May 2010 08:52:34 +0000 (17:52 +0900)
committer keisuke fukawa <keisuke@karesansui-project.info>
Thu, 13 May 2010 08:52:34 +0000 (17:52 +0900)
diff --cc karesansui/lib/const.py
Simple merge
diff --cc karesansui/lib/utils.py
Simple merge
author	keisuke fukawa <keisuke@karesansui-project.info>
	Thu, 13 May 2010 08:52:34 +0000 (17:52 +0900)
committer	keisuke fukawa <keisuke@karesansui-project.info>
	Thu, 13 May 2010 08:52:34 +0000 (17:52 +0900)
		1	2
karesansui/lib/const.py	patch \|	diff1 \|	diff2 \|	blob \| history
karesansui/lib/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history