Merge branch 'stable-etxff-bugfix' into stable
authorHenning Rogge <hrogge@googlemail.com>
Mon, 30 Nov 2009 19:48:14 +0000 (20:48 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Mon, 30 Nov 2009 19:48:14 +0000 (20:48 +0100)

Trivial merge