[akonadi/f18] include a couple upstream patches

[Rex Dieter]

Summary of changes:

  5cacb4e... include a couple upstream patches (*)

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