[hwdata/f19: 2/2] Merge branch 'master' into f19

[Michal Minar]

commit c7e8d263746eaf92b5c6dd116a6117f0bf541dbd
Merge: 5685f0d e1c0fea
Author: Michal Minar <miminar at redhat.com>
Date:   Tue Feb 25 09:47:13 2014 +0100

    Merge branch 'master' into f19

 .gitignore  |    2 +-
 hwdata.spec |   15 +++++++++------
 sources     |    2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)
---