Merge branch 'joar-skip_transcoding'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 4 Mar 2013 17:45:27 +0000 (11:45 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 4 Mar 2013 17:45:27 +0000 (11:45 -0600)

Trivial merge