[kfloppy/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 10d3c9ffd783ca83a70d56c2a7f64142ae1633e8
Merge: d5d6b99 3505173
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:35:25 2012 +0100

    Merge branch 'f18' into f17

 .gitignore   |    1 +
 kfloppy.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---