[plowshare/el5: 2/2] Merge branch 'master' into el5

[Elder Marco]

commit f4f1997037faa793a8b0b980b2b1e68cfe4091c7
Merge: ba9b54f 3355b88
Author: Elder Marco <eldermarco at gmail.com>
Date:   Fri Dec 30 16:25:04 2011 -0200

    Merge branch 'master' into el5

 .gitignore     |    1 +
 plowshare.spec |    7 +++++--
 sources        |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---