Merge branch 'origin'
authorMichel Dänzer <michel@tungstengraphics.com>
Sat, 3 Feb 2007 16:37:01 +0000 (17:37 +0100)
committerMichel Dänzer <michel@tungstengraphics.com>
Sat, 3 Feb 2007 16:37:01 +0000 (17:37 +0100)

Trivial merge