[hatari/f15: 4/4] Merge branch 'master' into f15

[musuruan]

commit 135b4870033bf5c8f0cea533ad5a6bf87bff7be7
Merge: 3a9c710 42e8009
Author: Andrea Musuruane <musuruan at gmail.com>
Date:   Sun Feb 5 16:42:23 2012 +0100

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	hatari.spec
    	sources

 .gitignore  |    5 +----
 hatari.spec |    8 +++++++-
 sources     |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index ff57b0e,eb52e9d..e8cc629
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,5 +1,1 @@@
--hatari-1.3.1.tar.bz2
--/hatari-1.4.0.tar.bz2
--/hatari-1.5.0.tar.bz2
--/hatari-1.6.0.tar.bz2
+ /hatari-1.6.1.tar.bz2