Merge branch 'master' into on-demand-loading

author Zack Rusin <zack@kde.org>

Sat, 27 Aug 2011 22:54:49 +0000 (18:54 -0400)

committer Zack Rusin <zack@kde.org>

Sat, 27 Aug 2011 22:54:49 +0000 (18:54 -0400)
author Zack Rusin <zack@kde.org>
Sat, 27 Aug 2011 22:54:49 +0000 (18:54 -0400)
committer Zack Rusin <zack@kde.org>
Sat, 27 Aug 2011 22:54:49 +0000 (18:54 -0400)
diff --cc trace_file.hpp
Simple merge
diff --cc trace_snappyfile.hpp
Simple merge
author	Zack Rusin <zack@kde.org>
	Sat, 27 Aug 2011 22:54:49 +0000 (18:54 -0400)
committer	Zack Rusin <zack@kde.org>
	Sat, 27 Aug 2011 22:54:49 +0000 (18:54 -0400)
		1	2
trace_file.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
trace_snappyfile.hpp	patch \|	diff1 \|	diff2 \|	blob \| history