am 3d1eb366: Follow API changes.
Jeff Sharkey [Tue, 1 Oct 2013 00:09:51 +0000 (17:09 -0700)]
* commit '3d1eb366ef744a8790d89535a585bb50bcc7c113':
  Follow API changes.


Trivial merge