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

[Than Ngo]

commit 9599dd4d6a09142aa509ce631a5bed70c5f0da21
Merge: 0b13406 50922b9
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:41:58 2012 +0100

    Merge branch 'f18' into f17

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