Automated merge with ssh://login.linux.duke.edu//home/groups/rpm/hg/rpm
authorPanu Matilainen <pmatilai@redhat.com>
Mon, 3 Sep 2007 12:23:38 +0000 (15:23 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Mon, 3 Sep 2007 12:23:38 +0000 (15:23 +0300)
1  2 
lib/poptALL.c
lib/rpmts.c

diff --cc lib/poptALL.c
Simple merge
diff --cc lib/rpmts.c
Simple merge