Merge branch 'master' into can-usb1
authorppisa <pisa@cmp.felk.cvut.cz>
Fri, 13 Mar 2009 00:40:14 +0000 (01:40 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Fri, 13 Mar 2009 00:40:14 +0000 (01:40 +0100)

Trivial merge