Squashed commit of the following:

commit 3ba1a20c761a77e2c0bf39151e9caa7e21412e63
Author: infirit <infirit@gmail.com>
Date:   Fri May 3 21:13:30 2013 +0200

    mate-file-manager-1.6.1-r1: Fix segfault + add small fix

    The prefferences from within caja was broken
    Also add small fix suggested by upstream on irc