[cyphesis/f16: 5/7] Merge branch 'master' into f16

[Bruno Wolff III]

commit 7021ec896cb6751eeb97d47362a1ac8070345174
Merge: 9b0078c a032801
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Tue Jan 24 00:01:18 2012 -0600

    Merge branch 'master' into f16

 cyphesis-gcc47.patch |   10 ++++++++++
 cyphesis.spec        |   16 +++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---