merge tip

diff --cc CHANGES
index 7db2a05075d116832160ca508aad5004816748f6,1cb4625d0e4c4eaec49a08bf6a36b05628de784c..4640408e384b47448df1b741cce0514b56f6a92d
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -12,13 -12,12 +12,18 @@@ CHANGE
      join(prop) would fail to render the second join outside the
      subquery, when joining on the same criterion as was on the 
      inside.
+ 
+   - Fixed bug in Query whereby the usage of aliased() constructs
+     would fail if the underlying table (but not the actual alias) 
+     were referenced inside the subquery generated by 
+     q.from_self() or q.select_from().
      
 +  - Fixed bug which affected all eagerload() and similar options 
 +    such that "remote" eager loads, i.e. eagerloads off of a lazy
 +    load such as query(A).options(eagerload(A.b, B.c))
 +    wouldn't eagerload anything, but using eagerload("b.c") would
 +    work fine.
 +     
  0.6beta2
  ========