am e67f0c97: (-s ours) Hack to fix issue #2125365: Sports Trivia compatability...
am e67f0c97: (-s ours) Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
Merge commit 'e67f0c97' into eclair
* commit 'e67f0c97':
Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)