Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Tue, 19 Apr 2011 21:25:12 +0000 (23:25 +0200)
committerLuke Howard <lukeh@padl.com>
Tue, 19 Apr 2011 21:25:12 +0000 (23:25 +0200)

Trivial merge