Matt Mullenweg wrote: > If we had a diff it would make merging easier. > Ask and ye shall receive. See Trac ticket: http://trac.wordpress.org/ticket/1400 Owen