[gcompris: 28/111] Merge remote-tracking branch 'upstream/master'

[Bruno Coudoin <bcoudoin src gnome org>]

commit e6221f0307a59200c32d3f4918a5c94daaf3394d
Merge: 9627f6f 9f090c7
Author: serah <serah4291 gmail com>
Date:   Tue Jun 12 18:30:27 2012 +0530

    Merge remote-tracking branch 'upstream/master'

 configure.ac                                       |    2 +-
 src/chess_computer-activity/chess.c                |   11 +++++++++--
 src/geo_country-activity/resources/voices          |    1 +
 .../resources/geography/afrique/Makefile.am        |    2 +-
 .../afrique/{burkina.png => burkina_faso.png}      |  Bin 328 -> 328 bytes
 .../resources/geography/board1_0.xml.in            |    2 +-
 .../resources/geography/board4_2.xml.in            |    2 +-
 .../resources/geography/continents/Makefile.am     |    2 +-
 .../continents/{antartica.png => antarctica.png}   |  Bin 300 -> 300 bytes
 9 files changed, 15 insertions(+), 7 deletions(-)
---