diff -r 4e0ede3fea7f openide.loaders/arch.xml
--- a/openide.loaders/arch.xml	Tue Sep 07 13:59:32 2010 +0200
+++ b/openide.loaders/arch.xml	Tue Sep 07 14:12:52 2010 +0200
@@ -162,6 +162,7 @@
             <li><api name="nameAndExt" category="stable" group="property" type="export"> contains the name and extension of the file that is being created</api></li>
             <li><api name="date" category="stable" group="property" type="export"> contains <code>String</code> representing the current day like <code>23. 3. 2007</code></api></li>
             <li><api name="time" category="stable" group="property" type="export"> contains <code>String</code> the current time like <code>17:18:30</code></api></li>
+            <li><api name="dateTime" category="stable" group="property" type="export"> contains <code>java.util.Date</code> representing current data and time like</api></li>
             <li><api name="encoding" category="stable" group="property" type="export"> contains <code>String</code> the file encoding of the template instance</api></li>
         </ul>
         
diff -r 4e0ede3fea7f openide.loaders/src/org/openide/loaders/DataObject.java
--- a/openide.loaders/src/org/openide/loaders/DataObject.java	Tue Sep 07 13:59:32 2010 +0200
+++ b/openide.loaders/src/org/openide/loaders/DataObject.java	Tue Sep 07 14:12:52 2010 +0200
@@ -1343,6 +1343,9 @@
             if (!all.containsKey("time")) { // NOI18N
                 all.put("time", DateFormat.getTimeInstance().format(d)); // NOI18N
             }
+            if (!all.containsKey("dateTime")) { // NOI18N
+                all.put("dateTime", d); // NOI18N
+            }
             
             return Collections.unmodifiableMap(all);
         }
diff -r 4e0ede3fea7f openide.loaders/test/unit/src/org/netbeans/modules/templates/SCFTHandlerTest.java
--- a/openide.loaders/test/unit/src/org/netbeans/modules/templates/SCFTHandlerTest.java	Tue Sep 07 13:59:32 2010 +0200
+++ b/openide.loaders/test/unit/src/org/netbeans/modules/templates/SCFTHandlerTest.java	Tue Sep 07 14:12:52 2010 +0200
@@ -243,6 +243,7 @@
             "<h2>${date}</h2>" +
             "<h3>${time}</h3>" +
             "<h4>${user}</h4>" +
+            "<h4>${dateTime?string(\"yy\")}</h4>" +
             "</html>";
         os.write(txt.getBytes());
         os.close();
@@ -265,6 +266,7 @@
         if (res.indexOf("time") >= 0) fail(res);
         if (res.indexOf("user") >= 0) fail(res);
         if (res.indexOf("name") >= 0) fail(res);
+        if (res.indexOf("dateTime") >= 0) fail(res);
     }
     
     private static String readFile(FileObject fo) throws IOException {