Merge branch 'master' into can-usb1
authorPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 20:46:19 +0000 (22:46 +0200)
committerPavel Pisa <pisa@cmp.felk.cvut.cz>
Sat, 1 Oct 2011 20:46:19 +0000 (22:46 +0200)
commit414ab4b12c9d723b5d375e01ef1c683c63d14d01
treef3bf7c8dce530ba7d211283b80449c8f8f7ffc4a
parent9152514c81ee47c7941fc64204a3eaace518acbd
parent21d8a0ab23ef9aa66557c7645c604887497f188a
Merge branch 'master' into can-usb1