Merge with siana/future

2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -672,7 +672,10 @@
 		
 			<key>FetchInventoryDescendents</key>
 			<boolean>false</boolean>
-		
+
+			<key>WebFetchInventoryDescendents</key>
+			<boolean>false</boolean>
+
 			<key>FetchInventory</key>
 			<boolean>true</boolean>