New commits:
commit ecf4c8db0af1d5c28098eea2f07e1417f32cf648
Merge: 9aa8aa3... 146cddb...
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
Merge branch 'origin'
commit 9aa8aa3268d13d976a324a391a5e4f0bc9755676
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>