am ad663d80: Merge from gingerbread

* commit 'ad663d8040ddd4f3e537117847f20d42797b429e':
  egl: fixes for object refcounts