ref: fd9df44a054260aef0aaf3d8acda61d35e3b001b
parent: 3c021e1d79704d270c0b42d018166b119964fcff
parent: 451ab0c01ea5c26132502bcba3530b8cf5dd6d8c
author: James Berry <jamesberry@google.com>
date: Wed Mar 21 08:37:17 EDT 2012
Merge "remove __inline for compiler compatibility"