Merge commit 'local_test_1130/test_0108' into b_l_test_0108
authorschon <schon@dev03-server>
Tue, 11 Jan 2011 04:09:57 +0000 (13:09 +0900)
committerschon <schon@dev03-server>
Tue, 11 Jan 2011 04:09:57 +0000 (13:09 +0900)
commita163bcd9de673bb920066461740284bd5001a7ce
treea05269b199c8c7f2fbacdf0ec883fddb7e0fa9af
parent9e2aa8f8a00a5e1e1605ea72de60dddfb354e577
parent70bedafa7929f14acfd040712d362737f2ad3747
Merge commit 'local_test_1130/test_0108' into b_l_test_0108