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)
commit29ad5c978b6c9ae79a8548b609cbba685cf16a47
tree9f5647c68e3d48e196376a34f3810b748c1fd776
parentf8de56dac5e77dca43eba1bb602883bf66806e7d
parent7df6b0791d8f48ca87617b9ef2efe770f9ca6720
Merge commit 'local_test_1130/vuplus-1.6' into b_l_test_1130