Merge branch 'master' into experimental
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 6 Nov 2009 17:17:22 +0000 (18:17 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 6 Nov 2009 17:17:22 +0000 (18:17 +0100)
commitbbb82688540582d2049b584e5263cbc0423fb551
tree0f1b87684f75518e793ce38f190adf2813c0007e
parent3c8f046e30595b284a2b9c391a7ee7bdf662a284
parent67085f6d562d83aaabae670146935a6efb04b97d
Merge branch 'master' into experimental

Conflicts:
lib/python/Components/config.py
lib/python/Components/NimManager.py
lib/python/Components/config.py