Code

Merge branch 'master' into ff/routeros
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 11:48:34 +0000 (12:48 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 11:48:34 +0000 (12:48 +0100)

Trivial merge