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

[Matej Cepl]

commit fa992c1ab676b36d2694d2c6f671b6185b78c436
Merge: d7a0e63 28d35c7
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sat Jul 30 23:17:38 2011 +0200

    Merge branch 'master' into el6

 101-ushare-upnp-build-fix.patch |  158 +++++++++++++++++++++++++++++++++++++++
 ushare.spec                     |   10 ++-
 2 files changed, 167 insertions(+), 1 deletions(-)
---