Merge branch 'ready/chrysn/linkmapenhancement'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:57:04 +0000 (21:57 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:57:04 +0000 (21:57 +0100)

Trivial merge