Merge branch 'master' into can-usb1
authorppisa <pisa@cmp.felk.cvut.cz>
Fri, 7 Aug 2009 16:05:34 +0000 (18:05 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Fri, 7 Aug 2009 16:05:34 +0000 (18:05 +0200)
commit779bc3b8240d56d70de8822803be364ca9c9ec8f
treeb5ffd891ecd8de76ac579cae4bd7a99594fb97ba
parentb8eadc244710147b4863bcbd35b29e190bea75ba
parent4ee1fa3f095f7da94c8996d3f499273ff84c9023
Merge branch 'master' into can-usb1