Merge 'subquery' into 'trunk'

diff --cc lib/DBIx/Class/Manual/Cookbook.pod
Simple merge

diff --cc lib/DBIx/Class/ResultSet.pm
Simple merge

diff --cc lib/DBIx/Class/Storage/DBI.pm
Simple merge