automated merge
authorAli Saidi <Ali.Saidi@ARM.com>
Thu, 30 Oct 2014 04:22:26 +0000 (23:22 -0500)
committerAli Saidi <Ali.Saidi@ARM.com>
Thu, 30 Oct 2014 04:22:26 +0000 (23:22 -0500)

Trivial merge