Merge branch 'master' of ssh://leaflabs.com/tonka-android/device/linaro/pandaboard