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
		1	2
lib/DBIx/Class/Manual/Cookbook.pod	patch \|	diff1 \|	diff2 \|	blob \| history
lib/DBIx/Class/ResultSet.pm	patch \|	diff1 \|	diff2 \|	blob \| history
lib/DBIx/Class/Storage/DBI.pm	patch \|	diff1 \|	diff2 \|	blob \| history