[gcompris: 34/111] Merge remote-tracking branch 'origin/serah_master'

[Bruno Coudoin <bcoudoin src gnome org>]

commit a59d9010443bc3725172d31e1289823b2734c6ee
Merge: ae14a8d 891b887
Author: serah <serah4291 gmail com>
Date:   Wed Jun 20 19:15:54 2012 +0530

    Merge remote-tracking branch 'origin/serah_master'

 src/intro_gravity-activity/intro_gravity.py        |  451 ++++++++-----------
 .../resources/intro_gravity/minus.png              |  Bin 1797 -> 0 bytes
 .../resources/intro_gravity/neptune.png            |  Bin 66789 -> 22877 bytes
 .../resources/intro_gravity/plus.png               |  Bin 1673 -> 0 bytes
 .../resources/intro_gravity/saturn.png             |  Bin 24841 -> 17075 bytes
 .../resources/intro_gravity/solar_system.svgz      |  Bin 496871 -> 0 bytes
 .../resources/intro_gravity/tux_spaceship.png      |  Bin 21742 -> 6082 bytes
 7 files changed, 190 insertions(+), 261 deletions(-)
---