Sorry, I messed up something in the previous merge apparently. git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha3@42190 a95241bf-73f2-0310-859d-f6bbb57e9c96