Stephan Aßmus 16326b3f6a Merged trunk changes from r32785 to r32787.
git-svn-id: file:///srv/svn/repos/haiku/haiku/branches/releases/r1alpha1@32811 a95241bf-73f2-0310-859d-f6bbb57e9c96
2009-08-29 11:22:56 +00:00
..