diff -r fed411af774a -r 68e83c3ffbb5 examples/TestMasterSlave/TestSlave.od
--- a/examples/TestMasterSlave/TestSlave.od	Mon Nov 12 13:24:17 2007 +0100
+++ b/examples/TestMasterSlave/TestSlave.od	Mon Nov 12 14:38:34 2007 +0100
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE PyObject SYSTEM "PyObjects.dtd">
-<PyObject module="node" class="Node" id="14595640">
-<attr name="Profile" type="dict" id="19726160" >
+<PyObject module="node" class="Node" id="11102832">
+<attr name="Profile" type="dict" id="18192832" >
 </attr>
 <attr name="Name" type="string">TestSlave</attr>
-<attr name="Dictionary" type="dict" id="19830656" >
+<attr name="Dictionary" type="dict" id="16242864" >
   <entry>
     <key type="numeric" value="4096" />
     <val type="numeric" value="301" />
@@ -59,7 +59,7 @@
   </entry>
   <entry>
     <key type="numeric" value="6146" />
-    <val type="list" id="15236200" >
+    <val type="list" id="11102184" >
       <item type="string" value="{True:&quot;$NODEID+0x%X80&quot;%(base+1),False:0}[base&lt;4]" />
       <item type="numeric" value="255" />
       <item type="numeric" value="5000" />
@@ -69,7 +69,7 @@
   </entry>
   <entry>
     <key type="numeric" value="4112" />
-    <val type="list" id="14584720" >
+    <val type="list" id="11101896" >
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
@@ -78,7 +78,7 @@
   </entry>
   <entry>
     <key type="numeric" value="4113" />
-    <val type="list" id="14595352" >
+    <val type="list" id="11102544" >
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
@@ -87,13 +87,13 @@
   </entry>
   <entry>
     <key type="numeric" value="6658" />
-    <val type="list" id="14595280" >
+    <val type="list" id="11102760" >
       <item type="numeric" value="537591824" />
     </val>
   </entry>
   <entry>
     <key type="numeric" value="6147" />
-    <val type="list" id="14595424" >
+    <val type="list" id="11102040" >
       <item type="string" value="{True:&quot;$NODEID+0x%X80&quot;%(base+1),False:0}[base&lt;4]" />
       <item type="numeric" value="252" />
       <item type="numeric" value="0" />
@@ -102,8 +102,12 @@
     </val>
   </entry>
   <entry>
+    <key type="numeric" value="4116" />
+    <val type="string" value="&quot;$NODEID+0x80&quot;" />
+  </entry>
+  <entry>
     <key type="numeric" value="4608" />
-    <val type="list" id="14595496" >
+    <val type="list" id="11102688" >
       <item type="string" value="&quot;$NODEID+0x600&quot;" />
       <item type="string" value="&quot;$NODEID+0x580&quot;" />
     </val>
@@ -114,7 +118,7 @@
   </entry>
   <entry>
     <key type="numeric" value="4120" />
-    <val type="list" id="14595568" >
+    <val type="list" id="11110808" >
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
@@ -123,7 +127,7 @@
   </entry>
   <entry>
     <key type="numeric" value="6148" />
-    <val type="list" id="14595712" >
+    <val type="list" id="11103192" >
       <item type="numeric" value="1025" />
       <item type="numeric" value="253" />
       <item type="numeric" value="0" />
@@ -145,7 +149,7 @@
   </entry>
   <entry>
     <key type="numeric" value="6659" />
-    <val type="list" id="14595784" >
+    <val type="list" id="11103264" >
       <item type="numeric" value="537657360" />
     </val>
   </entry>
@@ -155,7 +159,7 @@
   </entry>
   <entry>
     <key type="numeric" value="6144" />
-    <val type="list" id="14595856" >
+    <val type="list" id="11103408" >
       <item type="string" value="{True:&quot;$NODEID+0x%X80&quot;%(base+1),False:0}[base&lt;4]" />
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
@@ -165,13 +169,13 @@
   </entry>
   <entry>
     <key type="numeric" value="6660" />
-    <val type="list" id="14595928" >
+    <val type="list" id="11111240" >
       <item type="numeric" value="537657360" />
     </val>
   </entry>
   <entry>
     <key type="numeric" value="6656" />
-    <val type="list" id="14596000" >
+    <val type="list" id="11102112" >
       <item type="numeric" value="536870913" />
       <item type="numeric" value="536936449" />
       <item type="numeric" value="537001985" />
@@ -186,7 +190,7 @@
   </entry>
   <entry>
     <key type="numeric" value="4099" />
-    <val type="list" id="14596072" >
+    <val type="list" id="11110520" >
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
@@ -199,7 +203,7 @@
   </entry>
   <entry>
     <key type="numeric" value="6145" />
-    <val type="list" id="14596144" >
+    <val type="list" id="11111168" >
       <item type="string" value="{True:&quot;$NODEID+0x%X80&quot;%(base+1),False:0}[base&lt;4]" />
       <item type="numeric" value="0" />
       <item type="numeric" value="0" />
@@ -209,17 +213,17 @@
   </entry>
   <entry>
     <key type="numeric" value="6657" />
-    <val type="list" id="14596216" >
+    <val type="list" id="12077032" >
       <item type="numeric" value="537526288" />
     </val>
   </entry>
 </attr>
-<attr name="SpecificMenu" type="list" id="14596288" >
+<attr name="SpecificMenu" type="list" id="11101464" >
 </attr>
-<attr name="ParamsDictionary" type="dict" id="19829232" >
+<attr name="ParamsDictionary" type="dict" id="16301408" >
   <entry>
     <key type="numeric" value="8192" />
-    <val type="dict" id="19789856" >
+    <val type="dict" id="15731648" >
       <entry>
         <key type="string" value="callback" />
         <val type="False" value="" />
@@ -228,10 +232,10 @@
   </entry>
   <entry>
     <key type="numeric" value="6144" />
-    <val type="dict" id="19831952" >
+    <val type="dict" id="9567888" >
       <entry>
         <key type="numeric" value="2" />
-        <val type="dict" id="19726736" >
+        <val type="dict" id="16301984" >
           <entry>
             <key type="string" value="save" />
             <val type="True" value="" />
@@ -240,7 +244,7 @@
       </entry>
       <entry>
         <key type="numeric" value="3" />
-        <val type="dict" id="19787440" >
+        <val type="dict" id="19216992" >
           <entry>
             <key type="string" value="save" />
             <val type="True" value="" />
@@ -251,10 +255,10 @@
   </entry>
   <entry>
     <key type="numeric" value="6146" />
-    <val type="dict" id="19788880" >
+    <val type="dict" id="16269424" >
       <entry>
         <key type="numeric" value="2" />
-        <val type="dict" id="19682352" >
+        <val type="dict" id="19215136" >
           <entry>
             <key type="string" value="comment" />
             <val type="string">EVENT</val>
@@ -263,7 +267,7 @@
       </entry>
       <entry>
         <key type="numeric" value="3" />
-        <val type="dict" id="11679552" >
+        <val type="dict" id="19215424" >
           <entry>
             <key type="string" value="comment" />
             <val type="string">5000*100 µC = 500 ms</val>
@@ -272,7 +276,7 @@
       </entry>
       <entry>
         <key type="numeric" value="4" />
-        <val type="dict" id="12353264" >
+        <val type="dict" id="16249568" >
           <entry>
             <key type="string" value="comment" />
             <val type="string" value="" />
@@ -281,7 +285,7 @@
       </entry>
       <entry>
         <key type="numeric" value="5" />
-        <val type="dict" id="19812192" >
+        <val type="dict" id="9568176" >
           <entry>
             <key type="string" value="comment" />
             <val type="string">1000 ms</val>
@@ -292,10 +296,10 @@
   </entry>
   <entry>
     <key type="numeric" value="6147" />
-    <val type="dict" id="19775520" >
+    <val type="dict" id="16302272" >
       <entry>
         <key type="numeric" value="2" />
-        <val type="dict" id="19788512" >
+        <val type="dict" id="19261968" >
           <entry>
             <key type="string" value="comment" />
             <val type="string">RTR_SYNC</val>
@@ -306,10 +310,10 @@
   </entry>
   <entry>
     <key type="numeric" value="6148" />
-    <val type="dict" id="19832608" >
+    <val type="dict" id="19263360" >
       <entry>
         <key type="numeric" value="2" />
-        <val type="dict" id="19816608" >
+        <val type="dict" id="19260976" >
           <entry>
             <key type="string" value="comment" />
             <val type="string">RTR</val>
@@ -320,7 +324,7 @@
   </entry>
   <entry>
     <key type="numeric" value="4112" />
-    <val type="dict" id="19699184" >
+    <val type="dict" id="19261552" >
       <entry>
         <key type="string" value="callback" />
         <val type="True" value="" />
@@ -329,7 +333,7 @@
   </entry>
   <entry>
     <key type="numeric" value="4113" />
-    <val type="dict" id="19800640" >
+    <val type="dict" id="16301120" >
       <entry>
         <key type="string" value="callback" />
         <val type="True" value="" />
@@ -338,7 +342,7 @@
   </entry>
   <entry>
     <key type="numeric" value="4099" />
-    <val type="dict" id="19792416" >
+    <val type="dict" id="16249856" >
       <entry>
         <key type="string" value="callback" />
         <val type="True" value="" />
@@ -347,7 +351,7 @@
   </entry>
   <entry>
     <key type="numeric" value="4119" />
-    <val type="dict" id="19813056" >
+    <val type="dict" id="19263648" >
       <entry>
         <key type="string" value="callback" />
         <val type="True" value="" />
@@ -355,18 +359,18 @@
     </val>
   </entry>
 </attr>
-<attr name="UserMapping" type="dict" id="19799568" >
+<attr name="UserMapping" type="dict" id="16251168" >
   <entry>
     <key type="numeric" value="8192" />
-    <val type="dict" id="19833760" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14596360" >
-          <item type="dict" id="19828608" >
+    <val type="dict" id="19263936" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12076672" >
+          <item type="dict" id="19257456" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -398,15 +402,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8193" />
-    <val type="dict" id="19828944" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14596432" >
-          <item type="dict" id="19824608" >
+    <val type="dict" id="19264864" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="11111096" >
+          <item type="dict" id="19390480" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -438,15 +442,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8194" />
-    <val type="dict" id="19820608" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14596504" >
-          <item type="dict" id="19820896" >
+    <val type="dict" id="19264576" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12077896" >
+          <item type="dict" id="19215712" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -478,15 +482,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8195" />
-    <val type="dict" id="19842240" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14596576" >
-          <item type="dict" id="19842528" >
+    <val type="dict" id="19261264" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12077680" >
+          <item type="dict" id="19265152" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -518,15 +522,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8196" />
-    <val type="dict" id="19667488" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14596648" >
-          <item type="dict" id="19667776" >
+    <val type="dict" id="19391360" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="11110952" >
+          <item type="dict" id="19391072" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -558,15 +562,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8197" />
-    <val type="dict" id="19805728" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14596720" >
-          <item type="dict" id="19806016" >
+    <val type="dict" id="19388320" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12078256" >
+          <item type="dict" id="19391840" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -598,15 +602,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8198" />
-    <val type="dict" id="19790144" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14596792" >
-          <item type="dict" id="19790432" >
+    <val type="dict" id="19389952" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12077608" >
+          <item type="dict" id="19389664" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -638,15 +642,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8199" />
-    <val type="dict" id="19790864" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14596864" >
-          <item type="dict" id="19806992" >
+    <val type="dict" id="19394080" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12078400" >
+          <item type="dict" id="19392368" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -678,15 +682,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8200" />
-    <val type="dict" id="19807424" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14596936" >
-          <item type="dict" id="19807712" >
+    <val type="dict" id="19394848" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12078184" >
+          <item type="dict" id="19394560" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -718,15 +722,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8201" />
-    <val type="dict" id="19808144" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14597008" >
-          <item type="dict" id="19727248" >
+    <val type="dict" id="19395424" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12077968" >
+          <item type="dict" id="19396432" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -758,15 +762,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8202" />
-    <val type="dict" id="19727648" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14597080" >
-          <item type="dict" id="19727936" >
+    <val type="dict" id="19396000" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12077752" >
+          <item type="dict" id="19395712" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -798,15 +802,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8203" />
-    <val type="dict" id="19728400" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14597152" >
-          <item type="dict" id="19728688" >
+    <val type="dict" id="19398736" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12078472" >
+          <item type="dict" id="19397024" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -838,15 +842,15 @@
   </entry>
   <entry>
     <key type="numeric" value="8204" />
-    <val type="dict" id="19781664" >
-      <entry>
-        <key type="string" value="need" />
-        <val type="False" value="" />
-      </entry>
-      <entry>
-        <key type="string" value="values" />
-        <val type="list" id="14597224" >
-          <item type="dict" id="19781952" >
+    <val type="dict" id="19399504" >
+      <entry>
+        <key type="string" value="need" />
+        <val type="False" value="" />
+      </entry>
+      <entry>
+        <key type="string" value="values" />
+        <val type="list" id="12078544" >
+          <item type="dict" id="19399216" >
             <entry>
               <key type="string" value="access" />
               <val type="string" value="rw" />
@@ -877,7 +881,7 @@
     </val>
   </entry>
 </attr>
-<attr name="DS302" type="dict" id="19783136" >
+<attr name="DS302" type="dict" id="19400080" >
 </attr>
 <attr name="ProfileName" type="string" value="DS-301" />
 <attr name="Type" type="string">slave</attr>