[gnome-games/sudoku-tube: 14/15] Merge branch 'master' into work

[Zhang Sen <zhangsen src gnome org>]

commit 99fe3acdf573b68b193a30e7bc98feae84983e06
Merge: adc87cf... e88002f...
Author: Zhang Sen <zh jesse gmail com>
Date:   Mon Aug 17 17:59:37 2009 +0800

    Merge branch 'master' into work

 Makefile.am                                      |    2 +-
 aisleriot/Makefile.am                            |    2 +-
 aisleriot/board.c                                |    1 -
 aisleriot/board.h                                |   12 +
 configure.in                                     |   17 +-
 glchess/src/Makefile.am                          |    5 +-
 gnect/help/Makefile.am                           |    2 +-
 gnect/help/fi/fi.po                              |  827 +++
 gnome-sudoku/src/Makefile.am                     |    3 +-
 libgames-support/Makefile.am                     |   12 +-
 libgames-support/games-stock.c                   |    1 +
 lightsoff/Makefile.am                            |    1 -
 lightsoff/data/themes/tango/Makefile.am          |    1 -
 lightsoff/data/themes/up/Makefile.am             |    1 -
 po/ga.po                                         | 6166 ++++++++++++++--------
 po/kn.po                                         | 3791 ++++++++------
 same-gnome-clutter/Makefile.am                   |    1 -
 same-gnome-clutter/data/themes/tango/Makefile.am |    1 -
 same-gnome-clutter/data/themes/test/Makefile.am  |    1 -
 19 files changed, 6938 insertions(+), 3909 deletions(-)
---