- re-merge + CHANGES

diff --cc AUTHORS
index a6ad7a7a8baa2204a963287fb5034f3716991d5c,a6ad7a7a8baa2204a963287fb5034f3716991d5c..ecc5d6cc72bb406c4bb553f6b544298d686b368e
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -5,6 -5,6 +5,7 @@@ Major contributing authors include
  - Michael Bayer <mike_mp@zzzcomputing.com>
  - Jason Kirtland <jek@discorporate.us>
  - Gaetan de Menten <gdementen@gmail.com>
++- Diana Clarke <diana.joan.clarke@gmail.com>
  - Michael Trier <mtrier@gmail.com>
  - Philip Jenvey <pjenvey@underboss.org>
  - Ants Aasma <ants.aasma@gmail.com>

diff --cc CHANGES
index 49e0dcea9b1699d94055d94c2af7df2ef198ee3d,88ddad8f8f38c33493ff6d375b96e663d1f9e004..8fba962d4e03e3b5eaef50801b65cfb69186d6fa
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -3,32 -3,9 +3,41 @@@
  =======
  CHANGES
  =======
 -0.7.7
 -=====
 +0.7.7 - 0.7.xx
 +==============
 +
 +Changes which apply to 0.7.7 and subsequent versions of 0.7
 +are listed in the CHANGES file within the 0.7 branch.  All
 +those changes which are also in the 0.8 series (which is typically
 +all of them) are listed inline within the 0.8 changes above,
 +those which apply to an 0.7 release are noted.
 +
 +0.8.0b1
 +=======
  - orm
 +  - [feature] Major rewrite of relationship() 
 +    internals now allow join conditions which
 +    include columns pointing to themselves
 +    within composite foreign keys.   A new
 +    API for very specialized primaryjoin conditions
 +    is added, allowing conditions based on 
 +    SQL functions, CAST, etc. to be handled
 +    by placing the annotation functions
 +    remote() and foreign() inline within the
 +    expression when necessary.  Previous recipes
 +    using the semi-private _local_remote_pairs
 +    approach can be upgraded to this new 
 +    approach. [ticket:1401]
 +
++  - [feature] Query now "auto correlates" by 
++    default in the same way as select() does.
++    Previously, a Query used as a subquery
++    in another would require the correlate()
++    method be called explicitly in order to 
++    correlate a table on the inside to the
++    outside.  As always, correlate(None)
++    disables correlation.  [ticket:2179]
++
    - [feature] Added prefix_with() method
      to Query, calls upon select().prefix_with()
      to allow placement of MySQL SELECT

diff --cc lib/sqlalchemy/orm/query.py
Simple merge

diff --cc lib/sqlalchemy/orm/strategies.py
Simple merge