[folks/f16] (7 commits) ...Fix merge conflicts

[Brian Pepple]

Summary of changes:

  a6e4fec... Rebuld for libgee. (*)
  924091c... Update to 0.6.2 (*)
  99f7af4... Use old libgee api. (*)
  ebfc209... 0.6.2.1 (*)
  fa2898c... * Wed Sep 14 2011 Owen Taylor <otaylor at redhat.com> - 1:0.6. (*)
  cd7fc4c... Update to 0.6.3. Drop typelib patch. Fixed upstream. (*)
  adb3696... Fix merge conflicts

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