- merge revision 1.2

- merge revision 1.2
date: 2005/01/10 19:05:12;  author: mlhuang;  state: Exp;  lines: +60 -59
- fix DEBUGP() macro; newer gcc versions refuse to concatenate __FILE__
  and __FUNCTION__
- exp_gre: expectations must now be allocated by the helper/caller; it's
  been this way for at least a year, this patch was probably never
  tested
- merge revision 1.1
date: 2005/01/10 18:29:17;  author: mlhuang;  state: Exp;
patch-o-matic-ng-20050103 pptp-conntrack-nat