Merge r51046-r51048
authorColin Finck <colin@reactos.org>
Mon, 14 Mar 2011 14:58:36 +0000 (14:58 +0000)
committerColin Finck <colin@reactos.org>
Mon, 14 Mar 2011 14:58:36 +0000 (14:58 +0000)
svn path=/branches/ros-branch-0_3_13/; revision=51049


Trivial merge