Merge in gator version 5.17
authorJon Medhurst <tixy@linaro.org>
Thu, 19 Dec 2013 09:36:46 +0000 (09:36 +0000)
committerJon Medhurst <tixy@linaro.org>
Thu, 19 Dec 2013 09:36:46 +0000 (09:36 +0000)

Trivial merge