Merge branch 'stable' of git://193.238.157.30/olsrd into stable