trunk: initialize merge tracking for pulling bugfixes from 0.11-stable
Authored by: ecarter 2008-05-06
Parent: [r7014]
Child: [r7016]
