Merge branch 'master' into 1.7.0

Conflicts:
	ChangeLog
	NEWS
	configure.ac
This commit is contained in:
Paul Beckingham 2009-04-24 01:10:06 -04:00
commit e84c5c4a3c
7 changed files with 138 additions and 49 deletions

2
NEWS
View file

@ -10,7 +10,7 @@ Task has been built and tested on the following configurations:
- Ubuntu 7 Feisty Fawn
- Ubuntu 8 Hardy Heron
- Ubuntu 8.10 Intrepid Ibex
- Ubuntu 9.04 Jaunty Jackalope (beta)
- Ubuntu 9.04 Jaunty Jackalope
- Solaris 10
- Cygwin 1.5.25-14