Merge branch 'master' into openelec-pxe

This commit is contained in:
Stephan Raue 2011-04-05 21:04:00 +02:00
commit 0f90168ef1