From: Tom Ware <tom.ware_at_oracle.com>
Date: Wed, 21 Feb 2007 15:50:27 -0500
Fixed two issues
1. Query class was changed on Query's expression builder for certain
queries unnecessarily
2. Made the additional join criteria rebuild on the correct builder