Merge branch 'devel' of gitorious.org:meego-developer-tools/obs-light into devel...
authorronan <ronan@fridu.net>
Wed, 12 Dec 2012 10:25:31 +0000 (11:25 +0100)
committerronan <ronan@fridu.net>
Wed, 12 Dec 2012 10:25:31 +0000 (11:25 +0100)
commit80898868bcbf3e4b6685f988e5d29ef60bccc2d4
treec7dbf3fee7298498d458f1aee57cfbac258ae118
parenta68fdd00cc365909f91b47aa9f5922b1031e8a1d
parentf73acb32d38fc5ed98952bbef4d93b64ab0fe35d
Merge branch 'devel' of gitorious.org:meego-developer-tools/obs-light into devel-ronan
obslight/ObsLight/ObsLightPackage.py