2 commits

Author	SHA1	Message	Date
Micke Prag	ef5b4f7002	Fixed some errors in a merge from trunk	2010-08-30 14:01:13 +00:00
Micke Prag	f6260bec82	Merged -r579 from trunk into branches/2.0	2010-08-30 12:38:34 +00:00