Merge branch 'stable' into pud
authorFerry Huberts <f.huberts@mindef.nl>
Thu, 3 Nov 2011 11:12:02 +0000 (12:12 +0100)
committerFerry Huberts <f.huberts@mindef.nl>
Thu, 3 Nov 2011 11:12:02 +0000 (12:12 +0100)
* stable:
  Fix metric parsing for Quagga 0.99.x (thanks Jon Andersson)


Trivial merge