[whatsup/f17: 8/8] Merge branch 'el5' into f17

[David Brown]

commit 1b754644b9d055f2ad63fa58f01668e4ab915f9d
Merge: 3e04ca5 e93a14f
Author: David Brown <david.brown at pnnl.gov>
Date:   Sun Jul 29 17:18:36 2012 -0700

    Merge branch 'el5' into f17

 whatsup.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---