From: Henning Rogge <hrogge@googlemail.com>
Date: Mon, 25 Jan 2010 19:12:14 +0000 (+0100)
Subject: Merge branch 'stable' into tunnel
X-Git-Tag: OLSRD_0_6_0_fixed~70^2~38
X-Git-Url: http://olsr.org/git/?p=olsrd.git;a=commitdiff_plain;h=e91543250f44bfc9f49d830e53214fd4de5a0924

Merge branch 'stable' into tunnel
---

e91543250f44bfc9f49d830e53214fd4de5a0924