Merge branch 'master' of linux
authorj8takagi <j8takagi@nifty.com>
Thu, 16 Dec 2010 14:08:41 +0000 (23:08 +0900)
committerj8takagi <j8takagi@nifty.com>
Thu, 16 Dec 2010 14:08:41 +0000 (23:08 +0900)
Conflicts:
template/Define_test.mk

1  2 
template/Define_test.mk
template/Test.mk

Simple merge
Simple merge