Merge commit 'aba883a3a868d503ed7cefa5e5efb111c579be8e' into megamerge
authorMike Looijmans <milo-software@users.sourceforge.net>
Sat, 16 Oct 2010 11:25:34 +0000 (13:25 +0200)
committerMike Looijmans <milo-software@users.sourceforge.net>
Sat, 16 Oct 2010 11:25:34 +0000 (13:25 +0200)
commit4da1b7e2f2431a1cece39817de4bfeddc60eb3e5
treed97c3668c024a10dacd3b721a0d94e7ae1e7ecbd
parent9cdd4b6364274df200a9965e946710b014c2e05e
parentaba883a3a868d503ed7cefa5e5efb111c579be8e
Merge commit 'aba883a3a868d503ed7cefa5e5efb111c579be8e' into megamerge

Conflicts:
lib/base/Makefile.am
Makefile.am
configure.ac
lib/base/Makefile.am
lib/python/Plugins/Makefile.am
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/enigma_python.i