The following commit has been merged in the next branch: commit 96a3e817e2d9818c1698eae9ef772a204f4505f2 Merge: 3d7670d0745cd58108bc5516d0d5b525927c6cdf 701e35aaefdb351cbb0ccae70339903c4bea5e83 Author: Sven Eckelmann sven@narfation.org Date: Sun May 8 14:45:34 2011 +0200

Merge branch 'master' into next

Conflicts: main.h vis.c