[4ti2/f13/master: 4/4] Merge from master

[tremble]

commit 58c896a02e280bcd33175cbf7566e69302938675
Merge: 3c4f494 37fc03c
Author: Mark Chappell <tremble at fedoraproject.org>
Date:   Fri Oct 1 11:54:34 2010 +0200

    Merge from master

 4ti2.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---