From ad2d5d7e3a84d35b819e959d6ebab782f5d75b83 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 25 Apr 2009 19:00:57 +0000
Subject: Merge commit 'cheetah/master' into next

Conflicts:
	autogen.sh
---
(limited to 'lib/expat.cc')

--
cgit v0.9.0.2