am e54f267f: am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2

Merge commit 'e54f267f06e86f9c1248742fc56967355721a4e7'

* commit 'e54f267f06e86f9c1248742fc56967355721a4e7':
  Fix stupid bug in GLThreadManager implementation.