Automated merge with ssh://login.linux.duke.edu//home/groups/rpm/hg/rpm
authorPanu Matilainen <pmatilai@redhat.com>
Thu, 30 Aug 2007 14:12:08 +0000 (17:12 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Thu, 30 Aug 2007 14:12:08 +0000 (17:12 +0300)

Trivial merge