am a29dc1ba: Update to the new APIs.
Jeff Hamilton [Fri, 29 Oct 2010 15:28:23 +0000 (08:28 -0700)]
* commit 'a29dc1ba19e86ae23f8789bbb8fce6b57130c561':
  Update to the new APIs.


Trivial merge