Merge commit 'remotes/holizz/bf2'
authorDieter Plaetinck <dieter@plaetinck.be>
Wed, 26 Aug 2009 18:04:42 +0000 (20:04 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Wed, 26 Aug 2009 18:04:42 +0000 (20:04 +0200)

Trivial merge