[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.2.0-1-6-g9e0b20a

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 9e0b20a4cc90297cc18dc21a8f90cad8a7cc061a
Merge: 73ec1cb3818955658d01f485be15920cb5076e9f 5e01346430d5647723e443d747988e79153658a7
Author: Ansgar Burchardt <ansgar at 43-1.org>
Date:   Sat Jun 5 19:49:10 2010 +0900

    Merge branch 'upstream'


-- 
Civilization turn-based strategy game