[accountsservice: 4/4] Merge commit '907d6b5138a7660cad96649160f84f29bd3430fe'

[Adam Williamson]

commit b45bf68bcd6f5ce38a42a7160e7709cff0960c1b
Merge: 52108dc 907d6b5
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Nov 9 12:31:15 2011 -0800

    Merge commit '907d6b5138a7660cad96649160f84f29bd3430fe'
    
    Conflicts:
    	accountsservice.spec

 .gitignore             |    1 +
 accountsservice.spec   |   18 ++++++++++++------
 fix-wtmp-loading.patch |   29 +++++++++++++++++++++++++++++
 sources                |    2 +-
 4 files changed, 43 insertions(+), 7 deletions(-)
---