Merge branch 'master' of git://git.shadowcat.co.uk/catagits/App-IdiotBox into act... act-linking
Jess Robinson [Wed, 22 Dec 2010 12:09:29 +0000 (12:09 +0000)]

Trivial merge