[mate-control-center/f18] (4 commits) ...Merge branch 'master' into f18

[Wolfgang Ulbrich]

Summary of changes:

  f263d77... add mate-control-center_use-gnome-keyring_instead-of-mate-k (*)
  850dda8... add mate-control-center_use-gnome-keyring_instead-of-mate-k (*)
  5258ae4... adfix bogus date in %changelog (*)
  2dd0c4a... Merge branch 'master' into f18

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