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

[Than Ngo]

commit f384c4a3f5b0996feac7175bce47e2c7bb619280
Merge: f16ae70 0a99d33
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:32:59 2012 +0100

    Merge branch 'f18' into f17

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