Merge branch 'upstream'
authorXavier Boudet <x-boudet@ti.com>
Wed, 22 Aug 2012 08:12:47 +0000 (10:12 +0200)
committerXavier Boudet <x-boudet@ti.com>
Wed, 22 Aug 2012 08:12:47 +0000 (10:12 +0200)
commit980811c1a75a29c3e2f57cb6077641e9474b09f3
tree8055f7c3b606359b13a255ce40682ca9573aceb4
parent374350311f6d32e8fa5f51a75634b2afa135070b
parentd88a203dc1121cff62e9f974ff4afec2ed041c44
Merge branch 'upstream'

Conflicts:
.gitignore
.gitignore