merge 7708 from trunk
authorDana Jansens <danakj@orodu.net>
Wed, 11 Jul 2007 15:32:41 +0000 (15:32 +0000)
committerDana Jansens <danakj@orodu.net>
Wed, 11 Jul 2007 15:32:41 +0000 (15:32 +0000)
commitb40b25ddd43e45668ac7dce7cf80eeaf4394b6be
tree8184d531668a127a5c10ddab0f58d156597da82c
parentf5a5d2e2e9b8ed4b8f57f8dbea8234621d34705e
merge 7708 from trunk
Makefile.am