Merge branch 'stable' into pud
authorFerry Huberts <f.huberts@mindef.nl>
Mon, 10 Oct 2011 13:20:21 +0000 (15:20 +0200)
committerFerry Huberts <f.huberts@mindef.nl>
Mon, 10 Oct 2011 13:20:21 +0000 (15:20 +0200)
* stable:
  bmf: fix warnings
  parser: fix warnings


Trivial merge