Merge: Update of NSI CAN PCI kindly provided by Eric Pennamen pennamen AT gmail dot...
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 4 Jun 2006 21:59:00 +0000 (23:59 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 4 Jun 2006 21:59:00 +0000 (23:59 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge