update
Merge branch 'master' of github.com:coldnew/coldnew-emacs

Conflicts:
	pkglist.el
	recipes/o-blog.rcp
fix o-blog
update org secret
up
dasd
update
update