Automated merge with ssh://login.linux.duke.edu//home/groups/rpm/hg/rpm
authorPanu Matilainen <pmatilai@redhat.com>
Mon, 3 Sep 2007 09:23:50 +0000 (12:23 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Mon, 3 Sep 2007 09:23:50 +0000 (12:23 +0300)

Trivial merge