Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Wed, 27 Apr 2011 22:36:58 +0000 (00:36 +0200)
committerLuke Howard <lukeh@padl.com>
Wed, 27 Apr 2011 22:36:58 +0000 (00:36 +0200)

Trivial merge