Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/winsys/gdi/SConscript

1 files changed, 1 insertions, 1 deletions

diff --git a/common.py b/common.py
index d9e919ef76..1a99df41c0 100644
--- a/common.py
+++ b/common.py
@@ -61,7 +61,7 @@ def AddOptions(opts):
 	opts.Add(EnumOption('platform', 'target platform', default_platform,
 											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince')))
 	opts.Add(EnumOption('toolchain', 'compiler toolchain', 'default',
-											 allowed_values=('default', 'crossmingw')))
+											 allowed_values=('default', 'crossmingw', 'winddk')))
 	opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
 	opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))