Fix merge issue with Al's stuff.
commitecfd47f093152f7e499becc86c20aa5532ffc9fa
authorwelinder@troll.com <welinder@troll.com>
Fri, 13 Aug 2004 19:52:03 +0000 (13 12:52 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 8 Apr 2005 04:02:46 +0000 (7 21:02 -0700)
treeddcd912214478548358d4773f0f18c9decb046ef
parent807f74466b07af2aec34b5dca36568beab732c3e
Fix merge issue with Al's stuff.
parse.c