[rt3/f17: 2/2] Merge remote-tracking branch 'origin/f18' into f17

[corsepiu]

commit c7acf76c661b3ca336eb4a18e9b68a7ac6820746
Merge: 4ee0645 bc7294f
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Sun Oct 28 17:30:48 2012 +0100

    Merge remote-tracking branch 'origin/f18' into f17

 .gitignore |    2 +-
 rt3.spec   |    6 +++++-
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---