Merge branch 'static-routing' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Jul 2011 17:38:29 +0000 (19:38 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Jul 2011 17:38:29 +0000 (19:38 +0200)

Trivial merge