[caribou/keyboard_position: 13/19] Merge branch 'master' into keyboard_position

[Eitan Isaacson <eitani src gnome org>]

commit de54f1fe902a1c99c46ab090f0c2b3ca440b5b61
Merge: f543b33... 6ba9889...
Author: Eitan Isaacson <eitan monotonous org>
Date:   Tue Dec 1 16:09:36 2009 -0800

    Merge branch 'master' into keyboard_position

 README          |    7 +-
 src/caribou.py  |   17 +-
 src/config.svg  | 1080 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/keyboard.py |   57 +++-
 src/keysyms.py  |    2 +-
 src/qwerty.py   |   44 ++-
 6 files changed, 1176 insertions(+), 31 deletions(-)
---
diff --cc src/keyboard.py
index 0511c5f,758e73d..9881ca0
--- a/src/keyboard.py
+++ b/src/keyboard.py
@@@ -1,6 -1,6 +1,6 @@@
 -# -*- coding: UTF-8 -*-
 +# -*- coding: utf-8 -*-
  #
- # Carbou - On-screen Keyboard and UI navigation application
+ # Carbou - text entry and UI navigation application
  #
  # Copyright (C) 2009 Adaptive Technology Resource Centre
  #