merge of 'b96a1271f00720aba73dc0f7c2b08974c38252ac'
authorSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 12:09:05 +0000 (12:09 +0000)
committerSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 12:09:05 +0000 (12:09 +0000)
commit406bf2957c811123cfe84228f43684449fd50663
treeb633b2f7e33c552132879c0bb1e889a7fb2dfa06
parent1c800468bdb51dc83c3e57994d9e17bb5b124f96
parent955ee67fb9e48d28ab8d95f2df6cea1e9ef1e33b
Merge ... 'b96a1271f00720aba73dc0f7c2b08974c38252ac'
     and 'c43653bfb560ae719097dc966db74985b9b905ba'