From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 29 Jun 2008 20:30:00 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~913
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3dc25fc5ec3c06223a18552ab480e2d983a5fce;p=ipfire-3.x.git

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

Conflicts:

	tools/make-include
---

c3dc25fc5ec3c06223a18552ab480e2d983a5fce