From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 6 Jul 2011 17:38:29 +0000 (+0200)
Subject: Merge branch 'static-routing' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=3717a205a61b582ba5426da008a548bf98085742

Merge branch 'static-routing' into next
---

3717a205a61b582ba5426da008a548bf98085742