Merge branch '1.2'

Conflicts:
	configure.ac
This commit is contained in:
Petri Lehtinen
2010-03-28 21:44:41 +03:00
26 changed files with 147 additions and 23 deletions

View File

@@ -6,6 +6,9 @@
*/
#define _GNU_SOURCE
#include <config.h>
#include <stdlib.h>
#include <string.h>