[grfcodec/f13/master: 3/3] Merge remote-tracking branch 'origin/master' into f13

[Felix Kaechele]

commit b0ce4ed4e6089c2b09a76d547169dce7bf868e69
Merge: 3126cd0 e8401da
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sat Feb 12 11:36:06 2011 +0100

    Merge remote-tracking branch 'origin/master' into f13

 .gitignore    |    1 +
 grfcodec.spec |   12 +++++++++---
 sources       |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---