merge of '744cf977fa353b9dedb30f35cd9ba988ade94e8d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 1 Jan 2008 08:44:15 +0000 (08:44 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 1 Jan 2008 08:44:15 +0000 (08:44 +0000)
commit17c7effabf2aeaacc16a19778cfccf852779632a
tree87b3fb8f7d545acf49ffe28bd8976fcef265605d
parenteb8e5ff98cf3b86a7a6a7e412b4ba57d1255c79c
parent096a58d740aad373239ad5d5213a3fd0926a9ced
Merge ... '744cf977fa353b9dedb30f35cd9ba988ade94e8d'
     and 'cbd73e4685a6b456be3670606d5020189741092e'