Merge 'trunk' into 'sybase'

Merge 'trunk' into 'sybase'

r5536@hlagh (orig r6698):  wintrmute | 2009-06-17 01:32:30 -0700
Replace vague language around whether load_classes/namespaces is preferred,
with an explanation that load_namespaces() is generally preferred, and explain
when load_classes is appropriate.
r5539@hlagh (orig r6701):  caelum | 2009-06-17 10:50:47 -0700
fix page with offset bug
r5546@hlagh (orig r6703):  ribasushi | 2009-06-17 23:40:18 -0700
Cleanup attribute handling - I deal with resolved attributes throughout, no point in complicating things further
r5547@hlagh (orig r6704):  abraxxa | 2009-06-18 03:30:01 -0700
added test for nested has_many prefetch without entries

r5549@hlagh (orig r6706):  ribasushi | 2009-06-18 03:43:36 -0700
HRI fix
r5550@hlagh (orig r6707):  ribasushi | 2009-06-18 05:05:42 -0700
wtf