Merge remote-tracking branch 'tethera/master'
Conflicts:
tags/
3a9ce3cd2074e311f86f3e416644b2879516ffbf.
1338910938.git.jani@nikula.org/pushed
tags/
505a22a469143e310b1af8965161b6a008a3c527.
1338910938.git.jani@nikula.org/pushed
obsoleted by id:"
1338106946-7611-6-git-send-email-markwalters1009@gmail.com"
obsoleted by
d99270c4 (2012-05-24) if not earlyer