merge of '359cb2ede75783898c85d7b22cc9699eaf345d8a'
authorAndrew Wilcox <andy@protium.com>
Sat, 23 Dec 2006 22:10:30 +0000 (22:10 +0000)
committerAndrew Wilcox <andy@protium.com>
Sat, 23 Dec 2006 22:10:30 +0000 (22:10 +0000)
     and '81ad048dfdc6a3a80a0a2fa696910b31ad099b1d'


Trivial merge