diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2008-09-01 20:19:14 +0100 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2008-09-01 20:19:14 +0100 |
| commit | 5d7bdd0ed9595f515bdfaa8af76fcfd41be7a6a6 (patch) | |
| tree | c54c1c217a1742549ea1f1067419574aa1366d35 | |
| parent | d6bb5aa52793979616f0bfc5f38a0eb2e5f1c7e4 (diff) | |
| parent | 35f891404a6d2f0d034ca0fb724904db72baf552 (diff) | |
| parent | fb62a3cef5960885119f9e87c833520ddf2a9b49 (diff) | |
Merge commit 'remotes/jocke/ospf_neighbour'; commit 'remotes/jocke/snmp_crosscompile'