merge of '2c6aa2683a665c2762856be4d83ad176bdc97aaf'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 22 Jan 2007 05:13:06 +0000 (05:13 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 22 Jan 2007 05:13:06 +0000 (05:13 +0000)
     and '7057f1a32e0c40ec600851527ca7735abf4dcc62'


Trivial merge