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)
     and 'abcca41fb7edac5318b0cb0266d5f0c167f87c2f'


Trivial merge