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

[Jarod Wilson]

commit 20518bff2cd75da5c32ddf7399223bf8e34c901b
Merge: a1ade3b ff294dd
Author: Jarod Wilson <jarod at redhat.com>
Date:   Tue May 31 11:35:35 2011 -0400

    Merge branch 'master' into f15

 lirc.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---