Merge commit 'origin/master' into dev-mini2440-staging
commit38da1c1b4f34bc6c3edb54753154f43cd1a00e0e
authorMichel Pollet <buserror@gmail.com>
Tue, 10 Mar 2009 00:16:21 +0000 (10 00:16 +0000)
committerMichel Pollet <buserror@gmail.com>
Tue, 10 Mar 2009 00:16:21 +0000 (10 00:16 +0000)
treef245b25966cf7c292202a30562d6761a17bc1449
parentd02c4fe467ba927a5c138444dbaba60f8d5707bc
parentd42f183c0452a9c769b91e3911566566724983ff
Merge commit 'origin/master' into dev-mini2440-staging