From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 2 Jul 2010 19:05:48 +0000 (+0200)
Subject: Merge remote branch 'stevee/updates' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f31f79566099b958c745af8fa584da897c24ec5b;p=ipfire-3.x.git

Merge remote branch 'stevee/updates' into next

Conflicts:
	pkgs/core/pcre/pcre.nm
---

f31f79566099b958c745af8fa584da897c24ec5b