[gfs2-utils/f14/master: 4/4] Merge branch 'master' into f14

[Bob Peterson]

commit e570c0fb84bb0c16cd44fb10989435dc925ff626
Merge: 101c35b 07927fc
Author: Bob Peterson <rpeterso at redhat.com>
Date:   Fri Feb 25 08:30:56 2011 -0600

    Merge branch 'master' into f14

 .gitignore      |    1 +
 gfs2-utils.spec |   24 ++++++++++++++++++++----
 sources         |    2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)
---