[kamera/f18] (9 commits) ...Merge branch 'f18' into f17

Fri Mar 8 14:58:11 UTC 2013

Summary of changes:

  9e882bd... 4.8.4 (*)
  44315d2... 4.8.5 (*)
  f936beb... Merge branch 'master' into f17 (*)
  139b75a... fix another botched merge (*)
  98308ff... Merge branch 'f18' into f17 (*)
  00403c3... Merge branch 'f18' into f17 (*)
  cffd907... Merge branch 'f18' into f17 (*)
  13cceed... Merge branch 'f18' into f17 (*)
  70492bc... Merge branch 'f18' into f17 (*)

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