Updated to latest kernel image.
Merge remote-tracking branch 'nickdaly/master'

Conflicts:
	multistrap-configs/fbx-armel.conf
just say no to mercurial
don't force installation of mktorrent since not everyone will make weekly
running apt-get in a Makefile is too evil for me
clean up fstab handling vs git repository, remove symlink on clean
not convinced converting one README to html justifies python-docutils
move to use of freedombox meta-package for image building
Application proposal: print admin compoentnt (webapp + CUPS) for managing printers and scanners.
Merge remote-tracking branch 'nickdaly/master'

Conflicts:
	Makefile
	bin/mk_virtualbox_image
	multistrap-configs/fbx-base.conf
Committer: Keith <keith@fernie.eu>

	modified:   multistrap-configs/fbx-base.conf Include missing packages which are included in the virtualbox image, openssh-server changed to ssh to match the virtualbox image.
	new file:   source/home/fbx/plinth-startup.sh Script to setup Plinth, including access through Apache2.
Clean up list of packages to install.
Make it easier to figure out what packages are installed by
bin/mk_virtualbox_image, by listing the packages in one block,
and adding the --package argument for vmdebootstrap in another
code block.
Adjust URL to IRC channel to include the channel name.
Make first-boot init.d script a proper init.d script.
The script dependencies were wrong, making update-rc.d reject the script
when trying to insert it into the boot sequence, and there were no
argument handling.  With this change in place, it can be made part of
a Debian package and installed using the normal Debian tools.
Divert flash-kernel to allow all packages to configure.
In a foreign chroot, flash-kernel do not work properly and block
itself and initramfs-tools pakcages from configuring.  This in turn
can block other packages from being installed.  Avoid the problem by
diverting the flash-kernel binary away while configuring packages.
Use gdebi to install local packages with dependencies.
Instead of using dpkg --install, use gdebi to install,
as this will pull in any missing dependencies of the
packages being installed.
	modified:   plinth-startup.sh Restrict access to Plinth via Apache2 to local ip's only.
	modified:   plinth-startup.sh Restrict access to Plinth via Apache2 to local ip's only.
	modified:   plinth-startup.sh Restrict access to Plinth via Apache2 to local ip's only.
Merge branch 'master' of https://github.com/Keith2/freedom-maker

Conflicts:
	source/home/fbx/plinth-startup.sh

	modified:   plinth-startup.sh Restrict access to Plinth via Apache2 to local ip's only.