Merged revisions 242728 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 25 Jan 2010 05:45:00 +0000 (05:45 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 25 Jan 2010 05:45:00 +0000 (05:45 +0000)
commitafb9fab574aa997749e67be1154edd187007a0aa
treebbc40232f1f9c72bcceb5f5a87350c5e1cc9245c
parent137046e459062896a59ecfc1bc1c1015124bc214
Merged revisions 242728 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r242728 | tilghman | 2010-01-24 23:42:22 -0600 (Sun, 24 Jan 2010) | 2 lines

  Buildbot pointed out an error (thanks, buildbot!)
........

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