[grfcodec/f12/master: 7/7] Merge remote branch 'origin/master' into f12

[Felix Kaechele]

commit 340acc096eed1e2fd157f94c84923e548e55321f
Merge: 32fca7a a654c13
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Thu Oct 14 22:47:19 2010 +0200

    Merge remote branch 'origin/master' into f12

 .gitignore         |    4 ++-
 compile.patch      |   53 ----------------------------------------
 fedora-build.patch |   51 --------------------------------------
 grfcodec.spec      |   69 ++++++++++++++++++++++++++++++++-------------------
 sources            |    2 +-
 5 files changed, 47 insertions(+), 132 deletions(-)
---