[whatsup/el6: 2/2] Merge branch 'master' into el6

[David Brown]

commit a8ab5bf5d1d13cc9410f79317b23301968edd804
Merge: 285f3b4 8f5870c
Author: David Brown <david.brown at pnl.gov>
Date:   Tue Jul 24 21:37:16 2012 -0700

    Merge branch 'master' into el6

 whatsup.spec |   58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 11 deletions(-)
---