[lirc/f15/master: 2/2] Merge branch 'master' into f15

[Jarod Wilson]

commit 88fe803e62fd105656c2b8b2a29c57780523041e
Merge: 1b7c48c 40e4af6
Author: Jarod Wilson <jarod at redhat.com>
Date:   Tue May 3 11:03:12 2011 -0400

    Merge branch 'master' into f15

 lirc.spec |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)
---