Merge remote branch 'dream/master'
authorMike Looijmans <milo-software@users.sourceforge.net>
Tue, 11 Jan 2011 16:38:52 +0000 (17:38 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Tue, 11 Jan 2011 16:38:52 +0000 (17:38 +0100)
commitf04052f82b5124d6b633b19c892d0d2d6ac8cbcc
tree89486247743120e3fb9f65d6d48724d6bfa60dd1
parentf473f1bff3ef443e3631de12d12c89afcd7d2316
parent088902285e167e612e0f4ae8ae9f72a3e9079ea4
Merge remote branch 'dream/master'

Conflicts:
data/skin_default.xml
lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
main/Makefile.am
Makefile.am
configure.ac
lib/dvb/pmt.h
lib/python/Components/Harddisk.py
main/Makefile.am