Merge branch 'master' into can-usb1
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 2 Nov 2008 11:59:16 +0000 (12:59 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 2 Nov 2008 11:59:16 +0000 (12:59 +0100)

Trivial merge