Merge branch 'master'
Sam Ravnborg [Tue, 3 Jan 2006 14:59:28 +0000 (15:59 +0100)]

Trivial merge