[ushare/el6: 4/4] Merge branch 'master' into el6

[Matej Cepl]

commit d7a0e63bd991ca53b01cfcdf6f0797dc76c02051
Merge: 68d37b1 12a7b51
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jul 6 14:18:52 2011 +0200

    Merge branch 'master' into el6

 ushare.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---