Merge pull request #514 from kri5/wip-clang-compilation

author Sage Weil <sage@inktank.com>

Sat, 24 Aug 2013 04:21:57 +0000 (21:21 -0700)

committer Sage Weil <sage@inktank.com>

Sat, 24 Aug 2013 04:21:57 +0000 (21:21 -0700)
author Sage Weil <sage@inktank.com>
Sat, 24 Aug 2013 04:21:57 +0000 (21:21 -0700)
committer Sage Weil <sage@inktank.com>
Sat, 24 Aug 2013 04:21:57 +0000 (21:21 -0700)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 24 Aug 2013 04:21:57 +0000 (21:21 -0700)
committer	Sage Weil <sage@inktank.com>
	Sat, 24 Aug 2013 04:21:57 +0000 (21:21 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history