Merge remote-tracking branch 'u-boot/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 30 Sep 2012 21:49:17 +0000 (23:49 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 30 Sep 2012 21:49:17 +0000 (23:49 +0200)

Trivial merge