hg: jdk7/awt/jdk: 7036540: A change for 7021001 and some makefile changes have been pushed as a part of 7030062

[denis.fokin at sun.com]

Changeset: e00be783309b
Author:    denis
Date:      2011-04-14 13:53 +0400
URL:       http://hg.openjdk.java.net/jdk7/awt/jdk/rev/e00be783309b

7036540: A change for 7021001 and some makefile changes have been pushed as a part of 7030062
Reviewed-by: dcherepanov

! make/sun/jpeg/Makefile
! src/share/classes/java/awt/Toolkit.java