Comment 3 for bug 674462

The two proposed options for this are:

 * a dialog box when enabling a udf that will be merged: "enabling the cloud folder "such and such" will merge the contents with your folder "such and such" do you want to proceed? <Don't suscribe> <Suscribe and merge>"

 * a legend below the udf name saying it will be merged with the contents of the local folder

The one chosed should be used both when subscribing to UDFs from the Ubuntu One control panel or from the nautilus heading bar.