[freecol/f17: 4/4] Merge branch 'master' into f17

[Bruno Wolff III]

commit d2d749df1f689bc5e507d9ce68b5af8f76b13b89
Merge: 557af2c a74509a
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Mar 3 02:07:46 2012 -0600

    Merge branch 'master' into f17
    
    Conflicts:
    	freecol.spec

 .gitignore   |    1 +
 freecol.spec |   10 ++++++++--
 sources      |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---