merge tip

diff --cc CHANGES
index 6f79fc96fd8b022f84f091fc4fbd4e7c6def3627,d3442458125a80ca35b9cb0fab102194919fdca8..37e29a035f0e6583b957b1144c85ea0abc71b15b
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -43,25 -17,12 +43,30 @@@ CHANGE
      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.
  
 +  - Query gains an add_columns(*columns) method which is a multi-
 +    version of add_column(col).  add_column(col) is future 
 +    deprecated.
 +
 +  - Query.join() will detect if the end result will be 
 +    "FROM A JOIN A", and will raise an error if so.
 +
 +  - Query.join(Cls.propname, from_joinpoint=True) will check more
 +    carefully that "Cls" is compatible with the current joinpoint,
 +    and act the same way as Query.join("propname", from_joinpoint=True)
 +    in that regard.
 +    
+ - sql
+    - Fixed bug introduced in 0.6beta2 where column labels would 
+      render inside of column expressions already assigned a label.
+      [ticket:1747]
+      
  0.6beta2
  ========
  

diff --cc test/orm/test_query.py
Simple merge