Merge branch 'master' into emergency emergency
authorMark Wooding <mdw@distorted.org.uk>
Fri, 30 Mar 2012 16:41:50 +0000 (17:41 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 30 Mar 2012 16:41:50 +0000 (17:41 +0100)
* master:
  fender.m4: Define an address to be a guaranteed black hole.


Trivial merge