From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 27 Feb 2011 19:49:32 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d61530e65f89028b6711ab06bb2f3d9fd08e305;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	pkgs/ppl/patches/ppl-0.10.2-Makefile.patch
	pkgs/ppl/patches/ppl-0.10.2-gmp-build-fix.patch
	pkgs/ppl/patches/ppl-0.10.2-m4-update.patch
---

3d61530e65f89028b6711ab06bb2f3d9fd08e305