manually merge differences with the trunk
authorFabian Groffen <grobian@gentoo.org>
Mon, 12 May 2008 19:14:28 +0000 (19:14 -0000)
committerFabian Groffen <grobian@gentoo.org>
Mon, 12 May 2008 19:14:28 +0000 (19:14 -0000)
commit339ee9db95cffb5f2aa62fcfcc6be0cac461eda2
treea86c50f2a7fc515e200a7e3f34b9a486117fef01
parent9488fdf479ed04de5bfe162fce28a3e628cc5497
manually merge differences with the trunk

svn path=/main/branches/prefix/; revision=10304
bin/dispatch-conf
bin/repoman