Merge branch 'master' of github.com:heimdal/heimdal
authorLuke Howard <lukeh@padl.com>
Wed, 5 Jan 2011 04:49:15 +0000 (15:49 +1100)
committerLuke Howard <lukeh@padl.com>
Wed, 5 Jan 2011 04:49:15 +0000 (15:49 +1100)

Trivial merge