Merge commit 'local_test_1130/test_0108' into b_l_test_0108
authorschon <schon@dev03-server>
Tue, 11 Jan 2011 04:06:28 +0000 (13:06 +0900)
committerschon <schon@dev03-server>
Tue, 11 Jan 2011 04:06:28 +0000 (13:06 +0900)
commit9e2aa8f8a00a5e1e1605ea72de60dddfb354e577
tree5873c126806b569d86503cadd1db109db8509e7f
parent9da61f5ca51b8e96f0b092fb7721fd63e18bc695
parent729547e5434b2415f02292c74acdbac0b8d4af7d
Merge commit 'local_test_1130/test_0108' into b_l_test_0108