[python-rdflib/el6: 2/2] Merge branch 'master' into el6

[Pierre-YvesChibon]

commit 9247d77bfd0209736e8005f417da5fb8762e2010
Merge: 2323e27 c9394c6
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Wed Oct 10 17:00:38 2012 +0200

    Merge branch 'master' into el6

 ...-Skip-test-if-it-can-not-join-the-network.patch |   37 --------------------
 python-rdflib.spec                                 |   17 +++++++--
 2 files changed, 13 insertions(+), 41 deletions(-)
---