Commit 16fef95d4a990935f8257cb89df0d36846d1179b

Stefano Lattarini 2010-08-11T23:52:53

Merge branch 'maint' Conflicts: tests/acloca18.test tests/condinc2.test