Merge 'predicate_fix' into 'trunk'
Matt S Trout [Wed, 7 Nov 2007 18:55:36 +0000 (18:55 +0000)]
r59796@cain (orig r2938):  groditi | 2007-11-06 22:57:34 +0000
last fix so far


Trivial merge