From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 6 Dec 2010 00:21:07 +0000 (+0100)
Subject: Merge remote branch 'shark/cangw-test-36' into cangw-test-36
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/lisovros/linux_canprio.git/commitdiff_plain/db0ddb5578b357328bb4399dc900af9ad5b3181a

Merge remote branch 'shark/cangw-test-36' into cangw-test-36

Replace this branch with a new version (git merge -s ours)
---

db0ddb5578b357328bb4399dc900af9ad5b3181a