Merged federico-filename-entry to HEAD

[Federico Mena Quintero <federico ximian com>]

Hi,

I just merged the federico-filename-entry branch to HEAD.  This is for
the infamous bug #136541, aka "there's no filename entry".

It should mesh nicely with the merge of kris-async-branch, but I haven't
tested this very thoroughly.  Please file bugs if you find any, or
better yet, add cases to the test suite and file bugs then :)

  Federico