Merge remote-tracking branch 'upstream/master'
authorEagle[TM] <eagletm@mpex.net>
Mon, 26 Nov 2012 22:20:31 +0000 (23:20 +0100)
committerEagle[TM] <eagletm@mpex.net>
Mon, 26 Nov 2012 22:20:31 +0000 (23:20 +0100)

Trivial merge