Merge commit 'local_test_1130/vuplus-1.6' into b_l_test_1130
authorschon <schon@dev03-server>
Tue, 30 Nov 2010 05:17:17 +0000 (14:17 +0900)
committerschon <schon@dev03-server>
Tue, 30 Nov 2010 05:17:17 +0000 (14:17 +0900)

Trivial merge