merge of '10c20f13828f71806f4d990010db22c15e357aee'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 14 Jan 2008 14:20:49 +0000 (14:20 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 14 Jan 2008 14:20:49 +0000 (14:20 +0000)
     and '9d8d45b943c4a91e04be725ef12b609e39b3b0bd'


Trivial merge