Merge branch 'framework_history_mock'
authorGunnar Wrobel <p@rdus.de>
Tue, 29 Sep 2009 21:21:46 +0000 (23:21 +0200)
committerGunnar Wrobel <p@rdus.de>
Tue, 29 Sep 2009 21:21:46 +0000 (23:21 +0200)

Trivial merge