Merge commit 'dm/opendreambox-1.6' into test
authorschon <schon@dev03-server>
Mon, 27 Sep 2010 04:58:38 +0000 (13:58 +0900)
committerschon <schon@dev03-server>
Mon, 27 Sep 2010 04:58:38 +0000 (13:58 +0900)
commite04c135e5912f5f41242c4e10b1d7886e989f723
tree2ee628015282590292787c441e935698b40ae4fb
parent591b51e83f8e89454c393e10d5b05ce58957a91c
parentab85c686856dfbbbda5f4354579cbc509191f8e1
Merge commit 'dm/opendreambox-1.6' into test

Conflicts:
recipes/samba/samba.inc
recipes/samba/samba.inc