Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread * commit '16263d9f8cc01392c2f3678b381ce897647c8c81': Squashed commit of the following:
Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread * commit '16263d9f8cc01392c2f3678b381ce897647c8c81': Squashed commit of the following: