[gfs2-utils/f13/master: 5/5] Merge branch 'master' into f13

[Fabio M. Di Nitto]

commit e860cc02fdbe72202ecc4121a8c3fb7a92ce058e
Merge: dc7cc2c c4f049f
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Fri Dec 3 10:06:37 2010 +0100

    Merge branch 'master' into f13

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---