[s][pygi] Merge branch 'pygobjectport' master
authorJ. Félix Ontañón <fontanon@emergya.es>
Mon, 1 Aug 2011 16:17:59 +0000 (18:17 +0200)
committerJ. Félix Ontañón <fontanon@emergya.es>
Mon, 1 Aug 2011 16:19:12 +0000 (18:19 +0200)
commiteec89075dccb6c21e750ebcb5e6690c960545115
tree20748c55d454c7c680d799f80c8646e92207808b
parentea328c5e4d1796ae921aa249d89749815215cdfb
parent26f2163c86c768a380727daa0248ae5112ddd2ae
[s][pygi] Merge branch 'pygobjectport'

Conflicts:
udevdiscover/devicefinder.py
udevdiscover/devicefinder.py