merge trunk to hibernate4
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 9 Apr 2013 18:26:03 +0000 (18:26 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 9 Apr 2013 18:26:03 +0000 (18:26 +0000)

Trivial merge