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

[Elder Marco]

commit 64ddd3cc401f37979d7df50a985a2f4ab3b6c580
Merge: 297573b 6284c7d
Author: Elder Marco <eldermarco at gmail.com>
Date:   Wed Nov 23 22:38:55 2011 -0200

    Merge branch 'master' into el5

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