[hal/f14/master: 3/3] Merge branch 'master' into f14

[Lennart Poettering]

commit 087a0ea02fdd184c0ec707777d165c71121d08bf
Merge: 16bfb33 74d20ad
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Sep 13 21:10:38 2010 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	hal.spec

 do_not_check_hal_on_bus.patch |   27 ++++++++++++++++
 hal.spec                      |   70 ++++++++++++++++++++++++++++-------------
 haldaemon.service             |    8 +++++
 org.freedesktop.Hal.service   |    5 +++
 4 files changed, 88 insertions(+), 22 deletions(-)
---