merge from trunk
commit478550fa09602bf403812fc5597416c2a4aa441e
authorJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 15:57:09 +0000 (27 17:57 +0200)
committerJoakim Verona <joakim@verona.se>
Tue, 27 Aug 2013 15:57:09 +0000 (27 17:57 +0200)
treef59750d55dc92d77abac69d68a01e4ac677a4db5
parentb27d230fc41cb345855438f18c72dcb74ad488fe
parent3ed86db9c6ab0beb6cbe76e1ac5685856e8f8c59
merge from trunk
configure.ac