[whatsup/f17: 10/12] Merge branch 'f16' into f17

[David Brown]

commit a2a8e9a0e8f89d7813531a66387aa0eb7fbb036c
Merge: c061690 7277e20
Author: David Brown <david.brown at pnl.gov>
Date:   Tue Jul 24 10:56:05 2012 -0700

    Merge branch 'f16' into f17

 .gitignore |    3 +--
 sources    |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
---