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)
Conflicts:

recipes/enigma2/enigma2/vuplus/enigma2_vuplus_mediaplayer.patch


Trivial merge