Merge commit 'local_test_1130/test_0525' into b_l_test0525
authorschon <schon@dev03-server>
Wed, 25 May 2011 07:45:02 +0000 (16:45 +0900)
committerschon <schon@dev03-server>
Wed, 25 May 2011 07:45:02 +0000 (16:45 +0900)

Trivial merge