tree c54c1c217a1742549ea1f1067419574aa1366d35
parent d6bb5aa52793979616f0bfc5f38a0eb2e5f1c7e4
parent 35f891404a6d2f0d034ca0fb724904db72baf552
parent fb62a3cef5960885119f9e87c833520ddf2a9b49
author Paul Jakma <paul.jakma@sun.com> 1220296754 +0100
committer Paul Jakma <paul@quagga.net> 1220296754 +0100

Merge commit 'remotes/jocke/ospf_neighbour'; commit 'remotes/jocke/snmp_crosscompile'