Merge from trunk

diff --cc src/Common.am
index d9239cc54228f778a43d6339f028f0467f0b0518,7f4c8d7fc21278f57105ffab0aa80ba2c39c7252..dd10d15c5c05542e0b058b860b940e991e2fc587
--- 1/src/Common.am
--- 2/src/Common.am
+++ b/src/Common.am
@@@ -24,7 -24,8 +24,7 @@@ INCLUDES = 
  ## XXX: Do we really need this? Does auto-dependency tracking work?
  $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h
  
 -
  ## Because compatibility is almost universal. And the link order is important.
- COMPAT_LIBS = \
+ COMPAT_LIB = \
        -L$(top_builddir)/lib -lmiscutil \
        $(top_builddir)/compat/libcompat.la