[hwdata: 3/3] Merge branch 'f18'

[Michal Minar]

commit d7aea890c5da92c3864e437f33d24eb421fad2e0
Merge: 09181ee 73bd224
Author: Michal Minar <miminar at redhat.com>
Date:   Fri Dec 7 13:46:21 2012 +0100

    Merge branch 'f18'
    
    Conflicts:
    	.gitignore
    	hwdata.spec
    	sources

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