Merge branch 'master' into experimental
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Sat, 7 Nov 2009 12:53:41 +0000 (13:53 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Sat, 7 Nov 2009 12:53:41 +0000 (13:53 +0100)
commit2fded86dd8d04e121436ec88ab8d1a967a70628f
tree669aedd55783df19cb69f9b6b48de62c176a20eb
parentbbb82688540582d2049b584e5263cbc0423fb551
parentd883e2231e61eaeed7929088f249334a66731b77
Merge branch 'master' into experimental
lib/python/Components/NimManager.py
lib/python/Components/config.py