merge from trunk
commitef581ca7da4e9903cad73837cd451fd969adcdbd
authorJoakim Verona <joakim@verona.se>
Thu, 22 Aug 2013 17:47:29 +0000 (22 19:47 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 22 Aug 2013 17:47:29 +0000 (22 19:47 +0200)
tree207c12c604c215be32a68e1f7fd698782c000642
parent98b421872a0894ff860ac6284cd077c96475de1a
parent917c483a2976db21334425d87a33d45ba8c58d60
merge from trunk
configure.ac