Merge branch '1.1'
authorPetri Lehtinen <petri@digip.org>
Sun, 17 Jan 2010 11:57:20 +0000 (13:57 +0200)
committerPetri Lehtinen <petri@digip.org>
Sun, 17 Jan 2010 11:57:20 +0000 (13:57 +0200)
commitf9febb64c5dc15e03ecf3ca552e0654ee919b52e
treea6f694927514fdcd7eef4c1563c3ac2a6dccc725
parentb76ee75aad975849ce8a55d10c55e5090dd33d8f
parentaeb5b481c95c6bd71e3025a7965861ab82a643b8
Merge branch '1.1'

Conflicts:
Makefile.am
Makefile.am
configure.ac