Merge branch 'master' into android
authorJon Medhurst <tixy@linaro.org>
Mon, 14 Jan 2013 17:16:24 +0000 (17:16 +0000)
committerJon Medhurst <tixy@linaro.org>
Mon, 14 Jan 2013 17:16:24 +0000 (17:16 +0000)
commit3c295d4955ed76ce1fee385305153c1334a9b890
tree18ae79e6c43406e15fecda3e1c49775c2dc64cce
parent197f43d9c9c94dec5f05cb93047d9d10f7915265
parentbceca61860ed3cde4adc5c9231b7099d9b6f5786
Merge branch 'master' into android