Merge branch 'arnied-scheduler'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 14 Feb 2009 21:38:26 +0000 (22:38 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 14 Feb 2009 21:38:26 +0000 (22:38 +0100)
Conflicts:
arnied/arnied/schedule.cpp


Trivial merge