Merge remote-tracking branch 'dm/opendreambox-1.6' into test_0701
authorschon <schon@dev03-server>
Fri, 1 Jul 2011 05:43:56 +0000 (14:43 +0900)
committerschon <schon@dev03-server>
Fri, 1 Jul 2011 05:43:56 +0000 (14:43 +0900)

Trivial merge