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

[Elder Marco]

commit 48395f679113aaa7f02c764f49f896de937095dc
Merge: f4f1997 42f5c1c
Author: Elder Marco <eldermarco at gmail.com>
Date:   Mon Jan 16 09:25:01 2012 -0200

    Merge branch 'master' into el5

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