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

[David Brown]

commit f029db53c2235500b9db09590d591d41afaf9ce2
Merge: a8ab5bf e93a14f
Author: David Brown <david.brown at pnnl.gov>
Date:   Sun Jul 29 17:18:22 2012 -0700

    Merge branch 'el5' into el6

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