[Kdenlive-svn] [kdenlive/feature/jack] src: Merge branch 'master' into feature/jack

[Ed R. <ed....@go...>]

Git commit f5d066e64059a2b9c881375d3b250e30f87025fa by Ed Rogalsky.
Committed on 28/12/2012 at 13:29.
Pushed by rogalsky into branch 'feature/jack'.

Merge branch 'master' into feature/jack

M  +24   -23   src/mainwindow.cpp

http://commits.kde.org/kdenlive/f5d066e64059a2b9c881375d3b250e30f87025fa