On 11/08/2010 05:17 PM, Eric Blake wrote: > > Merge conflict - you can ignore any changes to these two files, now that > they is deleted. > > ACK. You may find some more instances of close() pop up as you rebase > on top of the latest tree, but it shouldn't be too hard to figure out. > Push now. Stefan