From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 19 Feb 2009 08:16:09 +0000 (+0100)
Subject: Merge branch 'devel-cherrypick'
X-Git-Tag: v0.1-sssa~10
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/285b226ff16603a9bf230be671843c37b36378a6

Merge branch 'devel-cherrypick'
---

285b226ff16603a9bf230be671843c37b36378a6