Merged revisions 9086 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r9086 | kpfleming | 2006-02-02 12:37:04 -0600 (Thu, 02 Feb 2006) | 2 lines

don't override ASTERISKVERSIONNUM to 000000 for non-svn builds

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9088 65c4cc65-6c06-0410-ace0-fbb531ad65f3