Merge commit '98b2c2e6306c77a40f9b9546a4f654e6ca78cf47'
commit272961dd7f1a6c7634ec513b6c2c057c35b2d124
authorBenjamin Otte <otte@gnome.org>
Sat, 6 Oct 2007 22:04:38 +0000 (7 00:04 +0200)
committerBenjamin Otte <otte@gnome.org>
Sat, 6 Oct 2007 22:04:38 +0000 (7 00:04 +0200)
tree72bc8c5ee61efed0fcbfc170735f84e234e94ea4
parentd32cb0a0c2cbba786ac500b8ea173b24a6299c97
parent98b2c2e6306c77a40f9b9546a4f654e6ca78cf47
Merge commit '98b2c2e6306c77a40f9b9546a4f654e6ca78cf47'