Merge branch 'merges'
authorSteve Youngs <steve@sxemacs.org>
Sat, 28 Jan 2012 00:15:37 +0000 (10:15 +1000)
committerSteve Youngs <steve@sxemacs.org>
Sat, 28 Jan 2012 00:15:37 +0000 (10:15 +1000)
commit7046eca757e9417ffe87af628f881ad6990af788
tree5acc6a8874426fcafcac736c36b20e6cea1800a7
parentd51ac4e0b91a3da7ab7f316b94997496046810bd
parenta941afbc9098decd61f411d7364c2abd493c6285
Merge branch 'merges'

* merges:
  Conditional definition of HAVE_ALLOCA to avoid meaningless HAVE_ALLOCA redefined warnings...
  Use the real pre-processor var: DEBUG_SXEMACS
  Coverity: Forward NULL: CID 607