Merge branch 'next-s3c-machines' into next-s3c

This commit is contained in:
Ben Dooks 2009-08-14 15:23:22 +01:00
commit 69e3728967
3 changed files with 287 additions and 2 deletions