Merge remote branch 'origin/release-4-5-patches'
authorSander Pronk <pronk@cbr.su.se>
Wed, 11 Aug 2010 18:21:57 +0000 (20:21 +0200)
committerSander Pronk <pronk@cbr.su.se>
Wed, 11 Aug 2010 18:21:57 +0000 (20:21 +0200)

Trivial merge