[ricci/f14/master: 11/11] Merge branch 'master' into f14

[Fabio M. Di Nitto]

commit ac1ab278ccff73e619e1ea1d44666bc68a17e430
Merge: 5f83b30 4be6d7f
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Thu Feb 10 12:48:59 2011 +0100

    Merge branch 'master' into f14

 .gitignore            |    7 +++++++
 gfs2-clusterfix.patch |   12 ------------
 ricci.spec            |   38 ++++++++++++++++++++++++++++++++++----
 sources               |    2 +-
 4 files changed, 42 insertions(+), 17 deletions(-)
---