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)
commitdae9774faaba7785f94f261cf3c9b8b6bd87bedb
tree0047a47c46cb3ddd18c042fb5927e6bd144b186d
parentd2aff6cb4dacdb5a549e7d36de02d60389a97958
parenta901485190070f5dd60cb1db4955a860e41ea042
Merge branch 'stable-etxff-bugfix' into stable