Merge 'trunk' into 'unresolvable_prefetch'
Peter Rabbitson [Wed, 1 Jul 2009 11:25:42 +0000 (11:25 +0000)]

Trivial merge