[caribou: 3/3] Merge branch 'color-and-size'

[Eitan Isaacson <eitani src gnome org>]

commit 7aff0f9d68029b8061fc9118e46f3ba854d97648
Merge: b708b45 f55c465
Author: Eitan Isaacson <eitan monotonous org>
Date:   Wed Sep 1 11:01:31 2010 -0700

    Merge branch 'color-and-size'

 caribou/ui/keyboard.py |  185 ++++++++++++++++++++++++++++++++++++++++--------
 caribou/ui/window.py   |    8 ++
 data/caribou-prefs.ui  |  156 ++++++++++++++++++++---------------------
 data/caribou.schemas   |   33 +++++++++
 4 files changed, 271 insertions(+), 111 deletions(-)
---