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

Trivial merge