Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play

Conflicts:
	Makefile

diff --cc Makefile
index 55175070a06e0522d5108a8d65bd8e9d8a2205ef,306f4f4979b5a398a0cc86253afa04217f64d314..688c7cec6cbb507a462b8b2686c475d0d342d481
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -30,7 -30,7 +30,7 @@@ CONFIG=$(PLAY)/slic3r-config.in
  FILAMENTSPOOL_AUTOS = filamentspool filamentspool-lt filamentspool-sm
  FILAMENTSPOOL_AUTOS += filamentspool-storarm3
  
- USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand bike-stalk-led-mount
 -USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand sewing-table
++USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand bike-stalk-led-mount sewing-table
  
  AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))