The following commit has been merged in the master branch: commit 5a1f1a52a2af40669b17db05cd18bb0b65b4afd0 Merge: 381755fddfc7a853a0b7cff7fcde122568828d39 624972cf3280ed43fc2e7a991b748361d3adebad Author: Marek Lindner lindner_marek@yahoo.de Date: Tue Nov 29 14:42:08 2011 +0800
Merge branch 'next'