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)
commitf7404c57db92c0937134095bf4f179bf04ab039b
tree7cec2f88eceb3a4cf4789083a3fd8337be3bdec8
parent867a0ff468c7c7c190e53c2c2817b475e5e00e14
parente15adf5dd52b48ae49dfe63e3b4a4fa235ca4a24
Merge r51046-r51048

svn path=/branches/ros-branch-0_3_13/; revision=51049