A new kernel (3.11.5-1) entered Debian unstable, and we don't want to ship
a different kernel in 0.21 final than what we had in 0.21~rc1 (3.10.11-1).

Conflicts:
	wiki/src/doc/first_steps.index.fr.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.de.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.es.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
	wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.pt.po
	wiki/src/doc/first_steps/persistence/configure.de.po
	wiki/src/doc/first_steps/persistence/configure.es.po
	wiki/src/doc/first_steps/persistence/configure.pt.po
	wiki/src/doc/first_steps/usb_installation.de.po
	wiki/src/doc/first_steps/usb_installation.es.po
	wiki/src/doc/first_steps/usb_installation.fr.po
	wiki/src/doc/first_steps/usb_installation.pt.po
	wiki/src/doc/first_steps/usb_upgrade.de.po
	wiki/src/doc/first_steps/usb_upgrade.es.po
	wiki/src/doc/first_steps/usb_upgrade.fr.po
	wiki/src/doc/first_steps/usb_upgrade.pt.po

Conflicts:
	wiki/src/doc/first_steps.index.de.po
	wiki/src/doc/first_steps.index.es.po
	wiki/src/doc/first_steps.index.fr.po
	wiki/src/doc/first_steps.index.pt.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.es.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
	wiki/src/support/found_a_problem.fr.po
	wiki/src/support/known_issues.de.po
	wiki/src/support/known_issues.es.po
	wiki/src/support/known_issues.fr.po
	wiki/src/support/known_issues.pt.po

This reverts commit 0a762639.

Since some applications do run under another user than 'amnesia' and
more privileges are required to see other users processes, the use of
VM.spawn which executes commands in the VM as root is necessary over the
use of VM.execute (which executes commands as 'amnesia').