Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Mon, 20 Feb 2012 13:02:10 +0000 (13:02 +0000)
committerJon Medhurst <tixy@linaro.org>
Mon, 20 Feb 2012 13:02:10 +0000 (13:02 +0000)
Conflicts:
driver/gator_main.c


Trivial merge