Merge remote branch 'origin/master' into pipe-video
authorThomas Balling Sørensen <tball@tball-laptop.(none)>
Tue, 5 Oct 2010 20:38:38 +0000 (22:38 +0200)
committerThomas Balling Sørensen <tball@tball-laptop.(none)>
Tue, 5 Oct 2010 20:38:38 +0000 (22:38 +0200)

Trivial merge