[sisyphus]

Long story short, I just had to update to try and get things working. I seem to be almost there, but plug:hdmi and plug:bluetooth have stopped working. in fact I've not got any audio out of her since I updated. Is there an easy way to get audio back?

Debug log: http://pastebin.com/m3967788c
r24153