Merge branch 'master' of ../master
authorWolfgang Denk <[email protected]>
Tue, 10 Aug 2010 20:20:27 +0000 (22:20 +0200)
committerWolfgang Denk <[email protected]>
Tue, 10 Aug 2010 20:20:27 +0000 (22:20 +0200)

Trivial merge