Merge change Ic52ba78c into eclair-mr2

* changes:
  Allow multiple OpenGL contexts on systems that support them.