Merge branch 'master' into mgorse
authorMike Gorse <mgorse@novell.com>
Mon, 16 Nov 2009 18:18:09 +0000 (13:18 -0500)
committerMike Gorse <mgorse@novell.com>
Mon, 16 Nov 2009 18:18:09 +0000 (13:18 -0500)
commitc1757b9e16d81434c25e435674cfe565b72eec11
tree5f62c17b9ef4bcab4db8674123e4faf281728be1
parentdf0130784ab8f3c233a09b1e6359e638fa6a4206
parent6158a7908c38fd35365688ff29e609ef5c09ea5f
Merge branch 'master' into mgorse

Conflicts:
registryd/deviceeventcontroller.c
registryd/registry.c
registryd/deviceeventcontroller.c
registryd/registry.c