[rxtx/el6/master: 9/9] Merge branch 'master' into el6

[Levente Farkas]

commit 131ddd1ebb141dd9f78937a9dfb70fb1a8ecc8ae
Merge: 6ed8d8d 20e5d7f
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Thu Mar 17 22:14:54 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	rxtx.spec

 rxtx-2.2-fhs_lock.patch |   13 +++++++++++++
 rxtx-2.2-lock.patch     |   12 ++++++++++++
 rxtx.spec               |   21 ++++++++++++++++++---
 3 files changed, 43 insertions(+), 3 deletions(-)
---