Merge branch 'stable' into pud
authorFerry Huberts <f.huberts@mindef.nl>
Tue, 18 Oct 2011 10:08:07 +0000 (12:08 +0200)
committerFerry Huberts <f.huberts@mindef.nl>
Tue, 18 Oct 2011 10:08:07 +0000 (12:08 +0200)
* stable:
  consolidate comments regarding if olsrd has to delete, or can rely on routes getting overwritten
  do not (falsely) rely on NLFM_REPLACE with fib_metric != FLAT
  spelling: it's 'receiving', not 'recieving'


Trivial merge