[rygel] (4 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  77cd3be... 0.12.0-2 (*)
  aaef1db... 0.12.0-3 (*)
  dea273c... Now we need to directly depend on intltool (*)
  bcccb53... fix merge (*)

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