The following commit has been merged in the next branch: commit 53fc756bed824b7a31f4be750d732f2228ed3c3f Merge: 072038eda720ca79b1b080922297ee1b16702428 32d1ad673cf104d05368129884c4ff3bcb2c7941 Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Nov 14 03:36:16 2011 +0800
Merge branch 'maint' into next
Conflicts: main.h