1.6.4:

2007-11-16  Armin Burgmeier  <[email protected]>

       * several files: Redid the merge I already wanted to do 10 days ago.
       Something went wrong and not all files have been merged.

2007-11-13  Murray Cumming  <[email protected]>

       * glom/Makefile.am: Add an extra repeated link line.
       * glom/frame_glom.h: Remove the horrible extra member
       variable hack around that linker strangeness.