merge patch from 158258
authorChristian Schaller <uraeus@gnome.org>
Sun, 12 Dec 2004 12:05:39 +0000 (12:05 +0000)
committerChristian Schaller <uraeus@gnome.org>
Sun, 12 Dec 2004 12:05:39 +0000 (12:05 +0000)
commitf46ec4e3b75d8e5c17b877c6c4d5d07898d3742b
treeb8633287cfa1b6c30b060d53926687797e98a106
parentb5d73d2ec82b55a24355657f9c1c69855dc8a798
merge patch from 158258

Original commit message from CVS:
merge patch from 158258
ChangeLog
configure.ac
ext/polyp/polypsink.c