Merge branch 'master' into local/stm32l_flash
authorFabien Le Mentec <texane@gmail.com>
Fri, 21 Oct 2011 09:28:45 +0000 (04:28 -0500)
committerFabien Le Mentec <texane@gmail.com>
Fri, 21 Oct 2011 09:28:45 +0000 (04:28 -0500)

Trivial merge