From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 5 Feb 2012 17:50:42 +0000 (+0000)
Subject: * Merge r55430 from trunk.
X-Git-Tag: ReactOS-0.3.14~2
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=b5d2889fe6dac2be151388f396a79daee7699ce3;hp=b5d2889fe6dac2be151388f396a79daee7699ce3

* Merge r55430 from trunk.

svn path=/branches/ros-branch-0_3_14/; revision=55436
---