Fertig!!
Merge remote-tracking branch 'in2prk/master'

Conflicts:
	JDBC/bin/de/hawhamburg/se/JDBCTest.class
	JDBC/src/de/hawhamburg/se/JDBCTest.java
	JPA_Annotations_Hibernate3/bin/META-INF/persistence.xml
	JPA_Annotations_Hibernate3/bin/de/hawhamburg/se/JPAAnnotationsTest.class
	JPA_Annotations_Hibernate3/src/META-INF/persistence.xml
	JPA_Annotations_Hibernate3/src/de/hawhamburg/se/JPAAnnotationsTest.java
	JPA_Locking_Hibernate3/bin/META-INF/persistence.xml
	JPA_Locking_Hibernate3/bin/de/hawhamburg/se/Customer.class
	JPA_Locking_Hibernate3/bin/de/hawhamburg/se/JPALockingTest.class
	JPA_Locking_Hibernate3/src/META-INF/persistence.xml
	JPA_Locking_Hibernate3/src/de/hawhamburg/se/Customer.java
	JPA_Locking_Hibernate3/src/de/hawhamburg/se/JPALockingTest.java
	JPA_Queries_Hibernate3/bin/META-INF/persistence.xml
	JPA_Queries_Hibernate3/bin/de/hawhamburg/se/JPAQueriesTest.class
	JPA_Queries_Hibernate3/src/META-INF/persistence.xml
	JPA_Queries_Hibernate3/src/de/hawhamburg/se/JPAQueriesTest.java
	JPA_Relationships_Hibernate3/bin/META-INF/persistence.xml
	JPA_Relationships_Hibernate3/bin/de/hawhamburg/se/JPARelationshipsTest.class
	JPA_Relationships_Hibernate3/src/META-INF/persistence.xml
	JPA_Relationships_Hibernate3/src/de/hawhamburg/se/JPARelationshipsTest.java
	JPA_XML_Hibernate3/bin/META-INF/persistence.xml
	JPA_XML_Hibernate3/bin/de/hawhamburg/se/JPAXMLTest.class
	JPA_XML_Hibernate3/src/META-INF/persistence.xml
	JPA_XML_Hibernate3/src/de/hawhamburg/se/JPAXMLTest.java
Merge branch 'haw_database'