[viking/f18] (6 commits) ...Merge branch 'master' of ssh://pkgs.fedoraproject.org/viking

[Fabian Affolter]

Summary of changes:

  5545fbc... * Sat Sep 10 2011 Fabian Affolter <fabian at bernewireless.net (*)
  ad9c8c7... Merge branch 'master' into f16 (*)
  db753c8... Updated (*)
  694aaaf... Merge branch 'f17' into f16 (*)
  e489324... * Wed Oct 24 2012 Fabian Affolter <mail at fabian-affolter.ch> (*)
  025945d... Merge branch 'master' of ssh://pkgs.fedoraproject.org/vikin (*)

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