[python-glanceclient/el6: 4/4] Merge branch 'f18' into el6

[Pádraig Brady]

commit 12266f481d07986e412970a0346204fef882ecd9
Merge: 9036835 d781da4
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Mar 27 16:45:32 2013 +0000

    Merge branch 'f18' into el6
    
    Conflicts:
    	python-glanceclient.spec

 python-glanceclient.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---