[caribou: 15/15] Merge branch 'scanning'

[Eitan Isaacson <eitani src gnome org>]

commit e9574f8a076a5c589d3150f80a6b2f5ae9ee7b78
Merge: ae17360 b6e4743
Author: Eitan Isaacson <eitan monotonous org>
Date:   Sat May 28 13:17:25 2011 -0700

    Merge branch 'scanning'

 caribou/antler/keyboard_view.py        |  140 +++++++++++++++----
 caribou/settings/caribou_settings.py   |   53 +++++---
 caribou/settings/preferences_window.py |    6 +-
 configure.ac                           |    4 +-
 data/antler/style.css                  |   33 ++++-
 data/layouts/Makefile.am               |    2 +-
 data/layouts/scan/Makefile.am          |    6 +
 data/layouts/scan/us.json              |   67 +++++++++
 libcaribou/Makefile.am                 |   11 +-
 libcaribou/column-model.vala           |   32 +++++
 libcaribou/group-model.vala            |    2 +-
 libcaribou/iscannable-group.vala       |   23 +++
 libcaribou/iscannable-item.vala        |    6 +
 libcaribou/json-deserializer.vala      |   36 +++--
 libcaribou/key-model.vala              |   31 +++-
 libcaribou/keyboard-model.vala         |   19 ++-
 libcaribou/level-model.vala            |   57 ++++++---
 libcaribou/row-model.vala              |   47 +++++--
 libcaribou/scannable-group.vala        |  129 +++++++++++++++++
 libcaribou/scanner.vala                |  241 ++++++++++++++++++++++++++++++++
 libcaribou/xadapter.vala               |  120 +++++++++++++---
 21 files changed, 932 insertions(+), 133 deletions(-)
---