Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sahumada@blackberry.com>
Tue, 11 Mar 2014 08:27:25 +0000 (09:27 +0100)
committerSergio Ahumada <sahumada@blackberry.com>
Tue, 11 Mar 2014 08:27:25 +0000 (09:27 +0100)
Change-Id: Ie0b3483867cc0c65f9b132bd520283333090db60


Trivial merge