Merge commit 'dm/experimental' into test_0108
authorschon <schon@dev03-server>
Tue, 18 Jan 2011 06:37:22 +0000 (15:37 +0900)
committerschon <schon@dev03-server>
Tue, 18 Jan 2011 06:37:22 +0000 (15:37 +0900)

Trivial merge