[wesnoth/f14/master: 4/4] Merge branch 'master' into f14

[Jon Ciesla]

commit de8e0e9ee6b2486649fbea3ef066b72e76f2d5fa
Merge: 838b51f f9137a8
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Aug 12 09:41:32 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	wesnoth.spec

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