[hdf5/f14/master: 3/3] Merge branch 'master' into f14

[Orion Poplawski]

commit 691696c6b79e34da1ba30978a6f0a227eda00dee
Merge: 8a409f4 55189b5
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Oct 28 08:36:11 2010 -0600

    Merge branch 'master' into f14

 hdf5.spec |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
---