merge of 'd94271d90df576fb623a5afb9f75864f7ec34546'
authorSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 12:09:11 +0000 (12:09 +0000)
committerSergey Lapin <slapinid@gmail.com>
Thu, 12 Jul 2007 12:09:11 +0000 (12:09 +0000)
     and 'f8480b9fe4209b03c291b9506684fe033956afa6'


Trivial merge