[caribou: 14/14] Merge branch 'kb-rework'

[Eitan Isaacson <eitani src gnome org>]

commit 6bed81d3860db5d6e91b527a910487d6f2ac3c78
Merge: ab599d5 4c9ac3c
Author: Eitan Isaacson <eitan monotonous org>
Date:   Thu Jun 10 08:52:26 2010 -0700

    Merge branch 'kb-rework'

 caribou/Makefile.am            |    2 -
 caribou/keyboard.py            |  394 +++++++++++++++++++++++++++-------------
 caribou/keyboards/Makefile.am  |   12 --
 caribou/keyboards/__init__.py  |   31 ---
 caribou/keyboards/keysyms.py   |   33 ----
 caribou/keyboards/qwerty.py    |   91 ---------
 caribou/keyboards/qwerty_es.py |   86 ---------
 caribou/keyboards/qwerty_sv.py |   97 ----------
 caribou/window.py              |   26 +++-
 configure.ac                   |    6 +-
 data/Makefile.am               |   13 ++-
 data/caribou.schemas           |   15 ++
 data/keyboards/Makefile.am     |    4 +
 data/keyboards/qwerty.xml      |  274 ++++++++++++++++++++++++++++
 14 files changed, 603 insertions(+), 481 deletions(-)
---