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)

Trivial merge