[accounts-dialog: 6/7] Merge branch 'lockbutton'

[Matthias Clasen <matthiasc src gnome org>]

commit 7bd5fcc0496e91463b06e65be7ee5babc4655bd5
Merge: 6d06688 5c3669b
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 29 11:55:00 2010 -0500

    Merge branch 'lockbutton'
    
    Conflicts:
    	TODO

 data/account-fingerprint.ui  |   23 +-
 data/language-chooser.ui     |    4 +-
 data/user-accounts-dialog.ui | 1035 +++++++++++++++++++++---------------------
 src/main.c                   |  697 ++++++++++++++++++----------
 src/um-fingerprint-dialog.c  |  101 +++--
 src/um-fingerprint-dialog.h  |   13 +-
 src/um-language-dialog.c     |  110 +++--
 src/um-language-dialog.h     |    5 +
 src/um-login-options.c       |    6 +-
 9 files changed, 1125 insertions(+), 869 deletions(-)
---