Merge branch 'master' of git://git.openpandora.org/openpandora.oe
[openpandora.oe.git] / conf /
drwxr-xr-x   ..
drwxr-xr-x - machine