From: Zack Rusin <zack@kde.org>
Date: Sat, 27 Aug 2011 22:54:49 +0000 (-0400)
Subject: Merge branch 'master' into on-demand-loading
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=c9385be0ae27a206be571f342f299c8762627b56

Merge branch 'master' into on-demand-loading

Conflicts:
	trace_snappyfile.hpp
---

c9385be0ae27a206be571f342f299c8762627b56