merge of '6bfc098b36170550230dc57120c75b31480dc6b3'
authorSergey Lapin <slapinid@gmail.com>
Mon, 3 Mar 2008 11:19:39 +0000 (11:19 +0000)
committerSergey Lapin <slapinid@gmail.com>
Mon, 3 Mar 2008 11:19:39 +0000 (11:19 +0000)
commit07c0de10dddece15b5a88e76ec94a9abc985b9cd
tree340de59696786aaa35070e7615700bf0bb491833
parentfd03b5166557844135feef144c2d78470f71f7e6
parent34c6339ee471446c0231675f9fc83d4a419d53c3
Merge ... '6bfc098b36170550230dc57120c75b31480dc6b3'
     and 'abcca41fb7edac5318b0cb0266d5f0c167f87c2f'