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)
commitfb1e8444b02cd7ae2536adc1bad79f5e01382767
tree77b924fe7a405a67942b1fb58dc7232d01c4dc88
parentab5f414f57a41d64ce202bfc90b847a78c444e82
parent8dc24176e78bfedea9f35fb667e738da8e16c956
Merge branch 'master' into can-usb1