[cups] (13 commits) ...Merge branch 'f15'

[Tim Waugh]

Summary of changes:

  019a41c... Set the default RIPCache to 128m (STR #3535, bug #549901). (*)
  9463d0b... Don't crash when unable to connect to D-Bus. (*)
  1cca59f... Fixed some typos in cups-icc.patch. (*)
  28f2e3a... Use correct port number when publishing services through Av (*)
  e663022... 1.4.7. (*)
  993cfb6... 1.4.7. (*)
  1a668d8... added to sources (*)
  e6c38fe... Updated avahi patches. (*)
  68e0ea8... Tag localization files correctly (bug #716421). (*)
  99d2fe0... Merged f14 using 'ours' to allow merging upwards through th (*)
  24f7bb4... Merge branch 'f14' into f15 (*)
  2b48db9... Merge branch 'f15' using 'ours' to allow merging upwards th
  a4221da... Merge branch 'f15'

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