[viking/f16] (9 commits) ...Updated

[Fabian Affolter]

Summary of changes:

  67902c5... 1.2.1 + gpsd 2.96+ fixes. Please note that I also committed (*)
  c1d3916... fix compile against curl 7.21.7 (*)
  3b02c74... helps when i remember to apply the patch (*)
  560869f... is it monday? :P (*)
  d9c64f1... Updated my e-mail address (*)
  fb40726... * Mon Nov 08 2011 Fabian Affolter <mail at fabian-affolter.ch> (*)
  9450a64... - Curl patch removed (is now upstream) (*)
  ad9c8c7... Merge branch 'master' into f16
  db753c8... Updated

(*) This commit already existed in another branch; no separate mail sent