Merged revisions 181898 via svnmerge from

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

Just recording the v1.4 change in trunk since it originally came from here.

........
  r181898 | rmudgett | 2009-03-12 20:19:29 -0500 (Thu, 12 Mar 2009) | 4 lines

  Use the correct branch integrated property when generating the version string.

  Copied the make_version file from Asterisk trunk.
........

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