Merge branch 'wip-wsgi' into next

author Dan Mick <dan.mick@inktank.com>

Fri, 12 Jul 2013 23:38:10 +0000 (16:38 -0700)

committer Dan Mick <dan.mick@inktank.com>

Fri, 12 Jul 2013 23:38:28 +0000 (16:38 -0700)
author Dan Mick <dan.mick@inktank.com>
Fri, 12 Jul 2013 23:38:10 +0000 (16:38 -0700)
committer Dan Mick <dan.mick@inktank.com>
Fri, 12 Jul 2013 23:38:28 +0000 (16:38 -0700)
diff --cc ceph.spec.in
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Dan Mick <dan.mick@inktank.com>
	Fri, 12 Jul 2013 23:38:10 +0000 (16:38 -0700)
committer	Dan Mick <dan.mick@inktank.com>
	Fri, 12 Jul 2013 23:38:28 +0000 (16:38 -0700)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history