am 5e1383f2: am ad663d80: Merge from gingerbread

* commit '5e1383f25782e553294bca387f3c072073416416':
  egl: fixes for object refcounts