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)
1  2 
lib/python/Components/NimManager.py
lib/python/Components/config.py

Simple merge
Simple merge