commit 841888d2c691de285dfcb3bed185aa3688a6bb38
Author: Alexander Larsson <alexl@redhat.com>
Date:   2009-12-15

    Update NEWS for release

M	NEWS

commit a799568dc744c6d5d715f3c05010506bb61583aa
Author: Alexander Larsson <alexl@redhat.com>
Date:	2009-12-15

    Make trash keybindings only work if the action is sensitive

    This fixes https://bugzilla.gnome.org/show_bug.cgi?id=603413 in
    a way not causing regressions.
    (cherry picked from commit 9c7c2c9d2cc0a8648abf2dbc851e9efec3e3df1c)

M	src/file-manager/fm-directory-view.c

commit 00516ab6c30430a83136a0092bfd2d7bf729b4d9
Author: Alexander Larsson <alexl@redhat.com>
Date:	2009-12-15

    Use right signal handler for delete signal action

    This is not actually called atm, since an action overrides it, but
    we should do it right anyway.
    (cherry picked from commit d87cf7e75c37d139631807bc22c07ba879f8218f)

M	src/file-manager/fm-directory-view.c

commit 74cf60a37bfbc21d9d3fb234db42cb235679296f
Author: Alexander Larsson <alexl@redhat.com>
Date:	2009-12-15

    Revert "Disable Trash/Delete key bindings when appropriate"

    This reverts commit ac73dd5c2159defcc9686f1ecce47059b48e2ccd.
    It causes regressions (see bug 603413)

M	src/file-manager/fm-actions.h
M	src/file-manager/fm-directory-view.c
M	src/file-manager/nautilus-directory-view-ui.xml

commit 87c51077a5b90d51db2b2ab22f59023043c7eb80
Author: Alexander Larsson <alexl@redhat.com>
Date:	2009-12-15

    Post release version bump

M	configure.in

commit 91489f225b5b6329af2a9bd84dd7712c50df082b
Author: Alexander Larsson <alexl@redhat.com>
Date:	2009-12-14

    Don't access uninitialized variable

    gdk_property_get doesn't set prop_text if it fails.
    (cherry picked from commit 75bcfea177c837215ea46c970bfea24ec04a3dae)

M	libnautilus-private/nautilus-icon-dnd.c
M	libnautilus-private/nautilus-tree-view-drag-dest.c