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

[Elder Marco]

commit ba9b54ffde17f7a55c5bdf0a8cb20b5f8515cbcc
Merge: 64ddd3c 6232366
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Dec 6 21:14:07 2011 -0200

    Merge branch 'master' into el5

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