[+ indicates stuff that went to Marcelo, o stuff that has not, * indicates stuff that is merged in mainstream now, X stuff that proved bad and was dropped out, - indicates stuff not relevant to the main tree]