Merges from the official Hg repository
http://sourceforge.net/p/octave/video/