carry over 06 stuff to 07

Signed-off-by: Andy Green <andy@warmcat.com>
3 files changed