Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Tue, 26 Apr 2011 15:58:13 +0000 (17:58 +0200)
committerLuke Howard <lukeh@padl.com>
Tue, 26 Apr 2011 15:58:13 +0000 (17:58 +0200)

Trivial merge