Merge commit 'origin/opendreambox-1.6' into test
authorikseong <ikseong@dev03-server.(none)>
Tue, 8 Jun 2010 02:39:46 +0000 (11:39 +0900)
committerikseong <ikseong@dev03-server.(none)>
Tue, 8 Jun 2010 02:39:46 +0000 (11:39 +0900)
commitbc73e8c1e777c34d246f1d67000d6b0195506e69
tree37df9358b46639eca37e6ba56a8ffaaf572b96a2
parent1cc5724c8fcaa87c9ad4c5ec03aa902894898c91
parentbcd98fffd8460ede2a61c8ccb94a0cb8766f987e
Merge commit 'origin/opendreambox-1.6' into test

Conflicts:

recipes/base-files/base-files_3.0.14.bb
-> fix revision
recipes/base-files/base-files_3.0.14.bb
recipes/libdreamdvd/libdreamdvd.bb