[openttd-opengfx/f13: 2/2] Merge remote-tracking branch 'origin/master' into f13

[Felix Kaechele]

commit 7d83759d682b0fd57e67f5efdfc2a5af7dde8005
Merge: 391e848 64df44e
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sun Jun 12 11:52:41 2011 +0200

    Merge remote-tracking branch 'origin/master' into f13

 .gitignore           |    1 +
 openttd-opengfx.spec |   21 ++++++++++++++++-----
 sources              |    2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)
---