[python-urllib2_kerberos/f16: 2/2] Merge branch 'master' into f16

[Tomas Dabasinskas]

commit 518f5fb13aa8114a48a18c988ee64b8a858c30d9
Merge: 9fb1e61 cf5373c
Author: Tomas Dabasinskas <tomas at redhat.com>
Date:   Tue Sep 4 20:38:17 2012 +1000

    Merge branch 'master' into f16

 python-urllib2_kerberos.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---