Merge branch 'upstream'
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>
Wed, 18 Jul 2012 00:38:49 +0000 (21:38 -0300)
committerRicardo Salveti de Araujo <ricardo.salveti@linaro.org>
Wed, 18 Jul 2012 00:38:49 +0000 (21:38 -0300)
commit672e9eeac45c6225d43938010e7bf5599ad5a7bc
treeb3943331c8ed150717c750483e356bc4b5e9f136
parenta80dc184ebef47e7fd2d7b467ebd2485ae49c810
parent9eb5822eb481185babf2b6559da9bf8d57a1f3de
Merge branch 'upstream'