--- src/Boo.Lang.Compiler/TypeSystem/NameResolutionService.cs.orig	Thu Jun 15 19:28:10 2006
+++ src/Boo.Lang.Compiler/TypeSystem/NameResolutionService.cs	Mon Jun 26 23:33:52 2006
@@ -215,27 +215,31 @@
 			string topLevel = parts[0];
 			
 			_innerBuffer.Clear();
-			if (Resolve(_innerBuffer, topLevel) && 1 == _innerBuffer.Count)
+			if (Resolve(_innerBuffer, topLevel))
 			{
-				INamespace ns = _innerBuffer[0] as INamespace;
-				if (null != ns)
+				foreach(object o in _innerBuffer.ToArray())
 				{
-					int last = parts.Length-1;
-					for (int i=1; i<last; ++i)				
-					{	
-						_innerBuffer.Clear();
-						if (!ns.Resolve(_innerBuffer, parts[i], EntityType.Any) ||
-							1 != _innerBuffer.Count)
-						{
-							return false;
-						}				
-						ns = _innerBuffer[0] as INamespace;
-						if (null == ns)
-						{
-							return false;
+					INamespace ns = o as INamespace;
+					if (null != ns)
+					{
+						int last = parts.Length-1;
+						for (int i=1; i<last; ++i)				

+						{	
+							_innerBuffer.Clear();
+							if (!ns.Resolve(_innerBuffer, parts[i], EntityType.Any) ||
+								1 != _innerBuffer.Count)
+							{
+								break;
+							}				
+							ns = _innerBuffer[0] as INamespace;
+							if (null == ns)
+							{
+								break;
+							}
 						}
+						if(ns.Resolve(targetList, parts[last], flags))
+							return true;
 					}
-					return ns.Resolve(targetList, parts[last], flags);
 				}
 			}
 			return false;
--- src/Boo.Lang.Compiler/TypeSystem/Namespace.cs.orig	Tue Feb 21 22:22:30 2006
+++ src/Boo.Lang.Compiler/TypeSystem/Namespace.cs	Mon Jun 26 23:00:26 2006
@@ -261,6 +261,9 @@
 					found = true;
 				}
 			}
+			// [DF] if we are looking for namespaces, search parent as well
+			if(NameResolutionService.IsFlagSet(flags, EntityType.Namespace) && _parent.Resolve(targetList, name, EntityType.Namespace))
+				found = true;
 			return found;
 		}