merge from trunk
commitc8d61aef58410a28fda7fbdf1bd49aa00c25d815
authorJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 08:12:21 +0000 (27 10:12 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 08:12:21 +0000 (27 10:12 +0200)
tree67e4354e57dac62ec2bd48234a898f810a0c75be
parent369c41754f0090065eb226e879f5c30a2a711132
parentc076ba953a2c7fe2b4ea80a66bec55250f5b6920
merge from trunk
configure.ac