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)
commit3cae18f0e126979eece1ff45c7a047fca679b141
tree1e9681e586cebf258be1271a8a231401d1ccf1c1
parent476cf5043a3d3cf3f2a9b70bc16e5b00755c6964
parent254175acd4e6edbecaa33a7e22455f387df02d58
Merge branch 'master' into android

Conflicts:
driver/gator_main.c