hg: jdk7u/jdk7u40: 2 new changesets

[lana.steuck at oracle.com]

Changeset: f6f6f414cdfe
Author:    tbell
Date:      2013-07-17 06:06 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u40/rev/f6f6f414cdfe

8012366: Fix for 8007815 breaks down when only building OpenJDK (without deploy and install forests)
Reviewed-by: dholmes, robilad

! Makefile

Changeset: af755d12719e
Author:    lana
Date:      2013-07-18 11:17 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u40/rev/af755d12719e

Merge