From de906c441a35892127a873dc6cffe930ec674390 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Fri, 12 Mar 2010 21:42:11 +0000
Subject: [PATCH] Merge trunk HEAD (46152)

svn path=/branches/header-work/; revision=46153