Merge in gator version 5.16
authorJon Medhurst <tixy@linaro.org>
Fri, 11 Oct 2013 11:53:06 +0000 (12:53 +0100)
committerJon Medhurst <tixy@linaro.org>
Fri, 11 Oct 2013 11:53:06 +0000 (12:53 +0100)

Trivial merge