[libhid/f14/master: 4/4] Merge branch 'master' into f14

[Manuel F Martinez]

commit 407d9bacae3d3f6ce6a53cd6b0d35e6fbe951bde
Merge: 023bac2 5e35c9f
Author: Manuel F Martinez <manpaz at bashlinux.com>
Date:   Thu Jan 27 09:28:43 2011 -0800

    Merge branch 'master' into f14
    
    Conflicts:
    	libhid.spec

 libhid.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---