Merge branch 'linktoimageonly' into wtk
authorW. Trevor King <wking@tremily.us>
Sun, 13 Jan 2013 12:12:55 +0000 (07:12 -0500)
committerW. Trevor King <wking@tremily.us>
Sun, 13 Jan 2013 12:12:55 +0000 (07:12 -0500)

Trivial merge