[whatsup/el6: 27/28] Merge branch 'f16' into el6

[David Brown]

commit 20a4c76df7b0262ecd1a159a756dc3c4565c51c3
Merge: 9a45e5e 7277e20
Author: David Brown <david.brown at pnl.gov>
Date:   Tue Jul 24 10:56:32 2012 -0700

    Merge branch 'f16' into el6
    
    Conflicts:
    	.gitignore

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