Merge from Mike Tsai
authorTrond Norbye <tn202803@tor01>
Tue, 3 Nov 2009 09:21:32 +0000 (10:21 +0100)
committerTrond Norbye <tn202803@tor01>
Tue, 3 Nov 2009 09:21:32 +0000 (10:21 +0100)

Trivial merge