Merged /trunk:r2130

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2262 4e380d45-d1fd-0310-85a7-d18ec86df0ad
use out_block_type in batched merger methods, too

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2263 4e380d45-d1fd-0310-85a7-d18ec86df0ad
apply trunk r2127,2129 to the alternative basic_runs_merger constructor, too

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2264 4e380d45-d1fd-0310-85a7-d18ec86df0ad
pass memory_to_use to basic_runs_merger::initialize()

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2265 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2131

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2266 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2134

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2267 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2132-2133,2141-2144,2161-2162

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2268 4e380d45-d1fd-0310-85a7-d18ec86df0ad
remove unused parameter

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2269 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2145-2146,2148-2149,2159

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2270 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2150,2154-2158,2163-2166

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2271 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2167-2193

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2272 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2218,2228-2229,2232,2237

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2273 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2209-2210,2220-2221,2226,2250-2251,2258

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2274 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2230,2236,2239-2243

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2275 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2160,2231,2238,2244-2245

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2276 4e380d45-d1fd-0310-85a7-d18ec86df0ad
bump version to 1.3.90

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2277 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2194-2208,2211-2217,2219,2222-2225,2227,2233-2235,2246-2249,2252,2254-2255

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2278 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2256-2257,2259-2292

git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2293 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2293-2316


git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2318 4e380d45-d1fd-0310-85a7-d18ec86df0ad
Merged /trunk:r2317-2371.


git-svn-id: svn://svn.code.sf.net/p/stxxl/code/branches/parallel_pipelining_integration@2372 4e380d45-d1fd-0310-85a7-d18ec86df0ad