just misc merge cleanups

git-svn-id: http://runuo.googlecode.com/svn/devel@1075 a9ff2418-eebe-19e0-0898-3207744d8c45