Merge 'predicate_fix' into 'trunk'
Matt S Trout [Wed, 7 Nov 2007 18:55:19 +0000 (18:55 +0000)]
r59795@cain (orig r2937):  groditi | 2007-11-06 22:17:40 +0000
changes so far


Trivial merge