changeset in /hg/icedtea: Merge

[Andrew John Hughes]

changeset df574d432c00 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=df574d432c00
description:
	Merge

diffstat:

1 file changed, 4 insertions(+)
ChangeLog |    4 ++++

diffs (14 lines):

diff -r 2174f64c8bc9 -r df574d432c00 ChangeLog
--- a/ChangeLog	Thu Aug 06 12:01:27 2009 +0100
+++ b/ChangeLog	Thu Aug 06 12:06:49 2009 +0100
@@ -2,6 +2,10 @@ 2009-08-06  Andrew John Hughes  <ahughes
 
 	* Makefile.am:
 	Bump JDK changeset to obtain execvpe fix.
+
+2009-08-06  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am.orig: Remove.
 
 2009-08-05  Mark Wielaard  <mjw at redhat.com>