Merge commit 'local_test_1130/test_0310' into b_l_test0310
authorschon <schon@dev03-server>
Thu, 17 Mar 2011 02:55:40 +0000 (11:55 +0900)
committerschon <schon@dev03-server>
Thu, 17 Mar 2011 02:55:40 +0000 (11:55 +0900)

Trivial merge