[caribou: 6/6] Merge branch 'bugfixes'

[Eitan Isaacson <eitani src gnome org>]

commit 23d272f9063cc5ac9e3b944cb4bd559ec7de3337
Merge: d7d255d 2787a4d
Author: Eitan Isaacson <eitan monotonous org>
Date:   Wed Jun 16 09:16:02 2010 -0700

    Merge branch 'bugfixes'

 .gitignore                    |    2 +-
 bin/caribou.in                |   12 ++++---
 caribou/Makefile.am           |   12 ++-----
 caribou/common/Makefile.am    |    8 +++++
 caribou/common/__init__.py    |    1 +
 caribou/common/const.py       |   61 +++++++++++++++++++++++++++++++++++++
 caribou/ui/Makefile.am        |   15 +++++++++
 caribou/ui/__init__.py        |    1 +
 caribou/{ => ui}/animation.py |    0
 caribou/{ => ui}/i18n.py.in   |    0
 caribou/{ => ui}/keyboard.py  |   46 ++++++++++------------------
 caribou/{ => ui}/main.py      |   67 ++++++++++++++++++++++++-----------------
 caribou/{ => ui}/opacity.py   |    0
 caribou/{ => ui}/window.py    |   12 +++++++-
 configure.ac                  |    4 ++-
 po/POTFILES.in                |    2 +-
 16 files changed, 168 insertions(+), 75 deletions(-)
---
diff --cc po/POTFILES.in
index 1fe1c67,1fe1c67..2359817
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -1,3 -1,3 +1,3 @@@
  [encoding: UTF-8]
--caribou/main.py
++caribou/ui/main.py
  [type: gettext/glade]data/caribou-prefs.ui