merge in latest svn.alleg.net /w AZ