gfs2-utils: master - Merge branch 'master' of git://git.fedorahosted.org/gfs2-utils

[Steven Whitehouse]

Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=c960ea154ba1c94022dc0184801ef8a17710e403
Commit:        c960ea154ba1c94022dc0184801ef8a17710e403
Parent:        cfae578070d8219cd3f3eb7c2f3bd8ab007c19e4 37231b6f2f25658ab64a131896a3c5e559c30e0c
Author:        Steven Whitehouse <steve@dolmen.chygwyn.com>
AuthorDate:    Tue Mar 24 20:53:57 2009 +0000
Committer:     Steven Whitehouse <steve@dolmen.chygwyn.com>
CommitterDate: Tue Mar 24 20:53:57 2009 +0000

Merge branch 'master' of git://git.fedorahosted.org/gfs2-utils


 Makefile                    |    8 +
 gfs2/convert/gfs2_convert.c |  498 +++++++++++++++++++++----------------------
 gfs2/libgfs2/fs_ops.c       |   10 +-
 gfs2/libgfs2/libgfs2.h      |    4 +
 4 files changed, 262 insertions(+), 258 deletions(-)