[pan2: 3/3] Merge branch 'hotkeys'

[Heinrich MÃller <henmull src gnome org>]

commit 2e24f684d32625a37c957ea54816ab0529c63037
Merge: 2c0961b fa35f2b
Author: Heinrich MÃller <henmull src gnome org>
Date:   Thu Jan 26 21:25:00 2012 +0100

    Merge branch 'hotkeys'

 pan.cbp                                            |    8 +-
 pan/data-impl/data-io.cc                           |   18 --
 pan/data-impl/data-io.h                            |    3 -
 pan/gui/Makefile.am                                |    3 +-
 pan/gui/actions.cc                                 |   32 +++-
 pan/gui/body-pane.cc                               |    1 +
 pan/gui/hotkeys.cc                                 |   56 -----
 pan/gui/hotkeys.h                                  |   31 ---
 pan/gui/prefs-ui.cc                                |  221 +++++++++++++++-----
 pan/gui/prefs-ui.h                                 |   27 +++
 pan/gui/prefs.cc                                   |   17 --
 pan/gui/prefs.h                                    |    3 -
 pan/icons/icon_article_unread.png.BACKUP.16201.png |  Bin 0 -> 593 bytes
 pan/icons/icon_article_unread.png.LOCAL.16201.png  |  Bin 0 -> 593 bytes
 pan/icons/icon_article_unread.png.REMOTE.16201.png |  Bin 0 -> 438 bytes
 15 files changed, 224 insertions(+), 196 deletions(-)
---