Merge commit 'local_test_1130/test_0108' into b_l_test_0108
authorschon <schon@dev03-server>
Tue, 11 Jan 2011 08:21:56 +0000 (17:21 +0900)
committerschon <schon@dev03-server>
Tue, 11 Jan 2011 08:21:56 +0000 (17:21 +0900)
commit9b55b65280d4d2589db5898b73c23623e018fb85
tree945732e428bedad330e784a6a83044ddd205503f
parenta163bcd9de673bb920066461740284bd5001a7ce
parent0bdb6a37748ede59f32b332922a3342006ee80b3
Merge commit 'local_test_1130/test_0108' into b_l_test_0108