Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Tue, 3 May 2011 14:54:26 +0000 (16:54 +0200)
committerLuke Howard <lukeh@padl.com>
Tue, 3 May 2011 14:54:26 +0000 (16:54 +0200)

Trivial merge