From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 7 Jul 2013 21:44:05 +0000 (+0200)
Subject: merge changes with timeout change
X-Git-Tag: legacy-preGL~21
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;ds=inline;h=0a4b9f5f2283b15acacf54d9048d9da0a7f9ab20;hp=0a4b9f5f2283b15acacf54d9048d9da0a7f9ab20;p=lantea.git

merge changes with timeout change
---