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)
commit8426d6627d053809ca80cfec354be9efd4c41702
tree62cf75b5e02f57a56ee8e5198b88fa2505223305
parentb2fe59745cc8cf1821d6dd2c00149b1687eaa40a
parent77bab367058da3ad594f840122f04f7507be603d
Merge commit 'local_test_1130/test_0525' into b_l_test0525