From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Sat, 14 Feb 2009 21:38:26 +0000 (+0100)
Subject: Merge branch 'arnied-scheduler'
X-Git-Tag: v2.6~132
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=49e01edd3da7ea8d1a1d3bfa0f5bf2baeac4094b;p=libi2ncommon

Merge branch 'arnied-scheduler'

Conflicts:
	arnied/arnied/schedule.cpp
---

49e01edd3da7ea8d1a1d3bfa0f5bf2baeac4094b