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

[Michal Minar]

commit f5565c488805e046990da08beab47b0f8871984f
Merge: 42e1087 a7a8656
Author: Michal Minar <miminar at redhat.com>
Date:   Fri Nov 29 10:08:53 2013 +0100

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	hwdata.spec
    	sources

 .gitignore  |    2 +-
 hwdata.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 6ee0457,c26564f..684a22f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/hwdata-0.257.tar.bz2
+ /hwdata-0.258.tar.bz2
diff --cc sources
index ebb3e98,8bb6728..aa4deb6
--- a/sources
+++ b/sources
@@@ -1,1 -1,2 +1,1 @@@
--83ff7de608be4a50b418b866944bb70e  hwdata-0.257.tar.bz2
+ dd25aa98e8c1f7a110493342f684839d  hwdata-0.258.tar.bz2