merge of '0f6a05ae6a2dd058bfe88bed97e9d6530e5c9395'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 25 Dec 2007 18:18:32 +0000 (18:18 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 25 Dec 2007 18:18:32 +0000 (18:18 +0000)
commit53d7efa6b73e39162f028cad3ce27f3265d226c0
tree53d0868df0e1f568f56f1e70d5ecba14f71618d7
parentad4884607bc29ec799316df7179368e78cce747c
parentf274a408a2bda158f637bd1b3fa4e0068fb87ed8
Merge ... '0f6a05ae6a2dd058bfe88bed97e9d6530e5c9395'
     and 'a2db4317a6940d3a7ea74bc07545523686942a59'