[whatsup/el5: 29/31] Merge branch 'master' into f16

[David Brown]

commit b9d513abb6d0c8fa01ba726262e0f23bb36bd3d8
Merge: 9666c18 c263781
Author: David Brown <david.brown at pnl.gov>
Date:   Tue Jul 24 10:54:01 2012 -0700

    Merge branch 'master' into f16
    
    Conflicts:
    	whatsup.spec

 whatsup.spec |   71 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 59 insertions(+), 12 deletions(-)
---