Merge branch 'master' into can-usb1
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 23 Nov 2008 22:52:27 +0000 (23:52 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 23 Nov 2008 22:52:27 +0000 (23:52 +0100)
commit0789c67983b502e2b83f9a447e3f6b2d0eff2a54
tree33795cbddf2caae65475fdfda251258aa25e19cd
parent94246cff7c0f45941a8b97317f9dd06d1956acce
parent5a5faefde7751e7fec5016059175b6f1109b914a
Merge branch 'master' into can-usb1

Conflicts:

lincan/src/Makefile.omk
lincan/src/Makefile.omk