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)
commit89bc399aa9a905624c912f69d97d25d001787554
treec48c7bba22b0357ff628ccb5919e2c4f232531e5
parent406bf2957c811123cfe84228f43684449fd50663
parent60558789753953c645270186ea79919a15fbde1b
Merge ... 'd94271d90df576fb623a5afb9f75864f7ec34546'
     and 'f8480b9fe4209b03c291b9506684fe033956afa6'