Merge commit 'local/vuplus-1.6' into vuplus-1.6
authorikseong <ikseong@vuplus>
Tue, 10 Aug 2010 01:01:11 +0000 (10:01 +0900)
committerikseong <ikseong@vuplus>
Tue, 10 Aug 2010 01:01:11 +0000 (10:01 +0900)
commit5722f778f869ae1dda67f270c66801c28373f5af
tree0b5030ed63624514d05223939df1f8cc880b9ca4
parent4ef7fabaaf2dfcdee1a93eb647caaa116e23cc0d
parent6e0b768b6c979afa1e36c7f3c3ab2eb6e4adad93
Merge commit 'local/vuplus-1.6' into vuplus-1.6

Conflicts:

recipes/enigma2/enigma2/vuplus/enigma2_vuplus_mediaplayer.patch