Merge branch 'master' into can-usb1
authorppisa <pisa@cmp.felk.cvut.cz>
Fri, 7 Aug 2009 16:05:34 +0000 (18:05 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Fri, 7 Aug 2009 16:05:34 +0000 (18:05 +0200)

Trivial merge