Merge branch 'mini2440-dev-likely' into mini2440-dev
authorMichel Pollet <buserror@gmail.com>
Tue, 24 Nov 2009 22:40:33 +0000 (24 22:40 +0000)
committerMichel Pollet <buserror@gmail.com>
Tue, 24 Nov 2009 22:40:33 +0000 (24 22:40 +0000)

Trivial merge