Merge branch 'master' of https://opensourceprojects.eu/git/p/timbus/context-population/extractors/linux-hw
Authored by: miguelnunes 2014-09-11
Parent(s): [4af3c1][894533]
Child(ren): [db406f]