Forgot one.
Merge branch 'master' of git://github.com/nursix/eden
Bugfix for S3SQLInlineComponentCheckbox
Merge branch 'master' of git://github.com/flavour/eden