modified:   debian/changelog
Merge branch 'master' of https://github.com/puppetnix/java_7u45.jdk

Conflicts:
	debian/changelog