merge of '375e23fc245ce8133b9f6b1700490e3ff83121e7'
authorAndrew Wilcox <andy@protium.com>
Sat, 23 Dec 2006 22:04:11 +0000 (22:04 +0000)
committerAndrew Wilcox <andy@protium.com>
Sat, 23 Dec 2006 22:04:11 +0000 (22:04 +0000)
     and 'a25740693ac2e076ba730cff4951a1681ae05cce'


Trivial merge