Merge remote branch 'origin/stable' into dev-mini2440-stable
authorMichel Pollet <buserror@gmail.com>
Thu, 24 Sep 2009 17:01:30 +0000 (24 18:01 +0100)
committerMichel Pollet <buserror@gmail.com>
Thu, 24 Sep 2009 17:01:30 +0000 (24 18:01 +0100)

Trivial merge