[rpc2/f12/master] (13 commits) ...Merge branches 'f12', 'f13', 'f14' and 'el6'

[Adam Goode]

Summary of changes:

  b30af1e... Fix typo that causes a failure to update the common directo (*)
  05b2515... Fix typo that causes a failure to update the common directo (*)
  ff24467... - Fix FTBFS (bz 565008) (*)
  c1831b0... Initialize branch F-13 for rpc2 (*)
  f4467d4... - New upstream release AES-CCM-16 was incorrectly named AES (*)
  de596ec... add forgotten source (*)
  0e4d28c... Initialize branch EL-6 for rpc2 (*)
  cd2852a... - New upstream release AES-CCM-16 was incorrectly named AES (*)
  1e3941f... dist-git conversion (*)
  a790705... dist-git conversion (*)
  430aaf1... dist-git conversion (*)
  08f144f... Merge branch 'f12' into el6
  f485b81... Merge branches 'f12', 'f13', 'f14' and 'el6'

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