[viking/f16: 8/9] Merge branch 'master' into f16

[Fabian Affolter]

commit ad9c8c732a6d2d6977dc5753478b9229d09e446e
Merge: 5545fbc 9450a64
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Nov 20 02:01:01 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	.gitignore
    	sources
    	viking.spec

 .gitignore                            |    4 +
 sources                               |    4 +
 viking-1.2.1-curl-7.21.7.patch        |   14 +++++
 viking-1.2.1-gpsd-2.96.patch          |  101 +++++++++++++++++++++++++++++++++
 viking-1.2.1-gpsd-2.96.patch.upstream |   62 ++++++++++++++++++++
 viking.spec                           |   56 +++++++++---------
 6 files changed, 213 insertions(+), 28 deletions(-)
---
diff --cc .gitignore
index 10a1fdc,dd1bb4e..abe8658
--- a/.gitignore
+++ b/.gitignore
@@@ -6,3 -6,4 +6,7 @@@ viking-0.9.94.tar.g
  /viking-1.1.tar.gz
  /viking-1.2.tar.gz
  /viking-1.2.1.tar.gz
++<<<<<<< HEAD
++=======
+ /viking-1.2.2.tar.gz
++>>>>>>> master
diff --cc sources
index 1fdff7f,08f815f..63f353a
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +bb6c14608a55e9d9dadf31e0ed4c7d1b  viking-1.2.1.tar.gz
++=======
+ 460121f135ddc499bb4e51e61fa7fba7  viking-1.2.2.tar.gz
++>>>>>>> master