From: j8takagi <j8takagi@nifty.com>
Date: Tue, 21 Dec 2010 03:34:34 +0000 (+0900)
Subject: Merge branch 'master' of linux
X-Git-Tag: v0.1p15~12
X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=commitdiff_plain;h=2d3d185962d2997a08cd2e674868cea35b99ae04

Merge branch 'master' of linux

Conflicts:
	test/system/casl2/Test.mk
---

2d3d185962d2997a08cd2e674868cea35b99ae04