From b2fe2944783230279d48d34459ae239296bad14b Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Thu, 27 Jan 2011 17:30:58 +0100
Subject: [PATCH] Update package.xml.

---
 horde/package.xml     |   60 +--
 imp/package.xml       |   88 +++--
 kronolith/package.xml | 1006 ++++++++++++++++++++++++-------------------------
 turba/package.xml     |  566 ++++++++++++++--------------
 4 files changed, 838 insertions(+), 882 deletions(-)

diff --git a/horde/package.xml b/horde/package.xml
index 1af2e04b7..a93cd0b73 100644
--- a/horde/package.xml
+++ b/horde/package.xml
@@ -19,8 +19,8 @@ applications.</description>
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2011-01-24</date>
- <time>23:18:50</time>
+ <date>2011-01-27</date>
+ <time>17:28:32</time>
  <version>
   <release>4.0.0</release>
   <api>4.0.0</api>
@@ -375,6 +375,7 @@ applications.</description>
     <dir name="LoginTasks">
      <dir name="SystemTask">
       <file name="GarbageCollection.php" role="horde" />
+      <file name="UpgradeFromHorde3.php" role="horde" />
      </dir> <!-- /lib/LoginTasks/SystemTask -->
      <dir name="Task">
       <file name="AdminCheck.php" role="horde" />
@@ -702,27 +703,10 @@ applications.</description>
      <file name="create.sql" role="data" />
      <file name="create.sybase.sql" role="data" />
      <file name="create.xml" role="data" />
-     <file name="horde_activesync.mssql.sql" role="data" />
-     <file name="horde_activesync.mysql.sql" role="data" />
-     <file name="horde_activesync.oci8.sql" role="data" />
-     <file name="horde_activesync.pgsql.sql" role="data" />
-     <file name="horde_activesync.sql" role="data" />
-     <file name="horde_alarms.mssql.sql" role="data" />
-     <file name="horde_alarms.oci8.sql" role="data" />
-     <file name="horde_alarms.pgsql.sql" role="data" />
-     <file name="horde_alarms.sql" role="data" />
-     <file name="horde_cache.pgsql.sql" role="data" />
-     <file name="horde_cache.sql" role="data" />
      <file name="horde_datatree.mssql.sql" role="data" />
      <file name="horde_datatree.mysql.sql" role="data" />
      <file name="horde_datatree.pgsql.sql" role="data" />
      <file name="horde_datatree.sql" role="data" />
-     <file name="horde_groups.mysql.sql" role="data" />
-     <file name="horde_groups.oci8.sql" role="data" />
-     <file name="horde_groups.pgsql.sql" role="data" />
-     <file name="horde_groups.sql" role="data" />
-     <file name="horde_histories.mssql.sql" role="data" />
-     <file name="horde_histories.sql" role="data" />
      <file name="horde_locks.sql" role="data" />
      <file name="horde_log.mssql.sql" role="data" />
      <file name="horde_log.sql" role="data" />
@@ -769,9 +753,6 @@ applications.</description>
      <file name="3.3_to_3.3.5.sql" role="data" />
      <file name="2005-09-22_horde_prefs_varchar2.oci8.sql" role="data" />
      <file name="2006-06-29_horde_prefs_indexes.sql" role="data" />
-     <file name="2007-02-21_horde_alarms_primary.sql" role="data" />
-     <file name="2007-04-25_horde_alarms_drop_primary.sql" role="data" />
-     <file name="2007-05-24_horde_alarms_add_dismissed.sql" role="data" />
      <file name="2008-04-04_horde_syncml_map_split_indexes.pgsql.sql" role="data" />
      <file name="2008-04-04_horde_syncml_map_split_indexes.sql" role="data" />
      <file name="2008-04-09_horde_syncml_map.php" role="data" />
@@ -783,14 +764,9 @@ applications.</description>
      <file name="2009-02-13_horde_sessionhandler_lastmodified_index.sql" role="data" />
      <file name="2009-04-13_horde_pgsql_upgrade.sql" role="data" />
      <file name="2009-09-10_horde_signup_drop_email.sql" role="data" />
-     <file name="2010-05-11_horde_activesync_adduserkey.sql" role="data" />
      <file name="2010-05-24_horde_perms_autoincrement.mysql.sql" role="data" />
      <file name="2010-05-24_horde_perms_autoincrement.oci8.sql" role="data" />
      <file name="2010-05-24_horde_perms_autoincrement.pgsql.sql" role="data" />
-     <file name="2010-06-01_horde_groups_autoincrement.mysql.sql" role="data" />
-     <file name="2010-06-01_horde_groups_autoincrement.oci8.sql" role="data" />
-     <file name="2010-06-01_horde_groups_autoincrement.pgsql.sql" role="data" />
-     <file name="2010-06-22_activesync_fix_syncdata_type.mysql.sql" role="data" />
      <file name="convert_datatree_groups_to_sql.php" role="data" />
      <file name="convert_datatree_perms_to_sql.php" role="data" />
      <file name="migrate_user_categories.php" role="data" />
@@ -2203,7 +2179,7 @@ applications.</description>
    <install as="admin/perms/index.php" name="admin/perms/index.php" />
    <install as="bin/active_sessions" name="bin/active_sessions" />
    <install as="bin/alarms" name="bin/alarms" />
-   <install as="check_logger" name="bin/check_logger" />
+   <install as="bin/check_logger" name="bin/check_logger" />
    <install as="bin/crond" name="bin/crond" />
    <install as="bin/db_migrate" name="bin/db_migrate" />
    <install as="bin/memcache_stats" name="bin/memcache_stats" />
@@ -2461,6 +2437,7 @@ applications.</description>
    <install as="lib/Block/weatherdotcom.php" name="lib/Block/weatherdotcom.php" />
    <install as="lib/Block/weatherdotcom_strings.php" name="lib/Block/weatherdotcom_strings.php" />
    <install as="lib/LoginTasks/SystemTask/GarbageCollection.php" name="lib/LoginTasks/SystemTask/GarbageCollection.php" />
+   <install as="lib/LoginTasks/SystemTask/UpgradeFromHorde3.php" name="lib/LoginTasks/SystemTask/UpgradeFromHorde3.php" />
    <install as="lib/LoginTasks/Task/AdminCheck.php" name="lib/LoginTasks/Task/AdminCheck.php" />
    <install as="lib/LoginTasks/Task/LastLogin.php" name="lib/LoginTasks/Task/LastLogin.php" />
    <install as="lib/LoginTasks/Task/TosAgreement.php" name="lib/LoginTasks/Task/TosAgreement.php" />
@@ -2607,27 +2584,10 @@ applications.</description>
    <install as="scripts/sql/create.sql" name="scripts/sql/create.sql" />
    <install as="scripts/sql/create.sybase.sql" name="scripts/sql/create.sybase.sql" />
    <install as="scripts/sql/create.xml" name="scripts/sql/create.xml" />
-   <install as="scripts/sql/horde_activesync.mssql.sql" name="scripts/sql/horde_activesync.mssql.sql" />
-   <install as="scripts/sql/horde_activesync.mysql.sql" name="scripts/sql/horde_activesync.mysql.sql" />
-   <install as="scripts/sql/horde_activesync.oci8.sql" name="scripts/sql/horde_activesync.oci8.sql" />
-   <install as="scripts/sql/horde_activesync.pgsql.sql" name="scripts/sql/horde_activesync.pgsql.sql" />
-   <install as="scripts/sql/horde_activesync.sql" name="scripts/sql/horde_activesync.sql" />
-   <install as="scripts/sql/horde_alarms.mssql.sql" name="scripts/sql/horde_alarms.mssql.sql" />
-   <install as="scripts/sql/horde_alarms.oci8.sql" name="scripts/sql/horde_alarms.oci8.sql" />
-   <install as="scripts/sql/horde_alarms.pgsql.sql" name="scripts/sql/horde_alarms.pgsql.sql" />
-   <install as="scripts/sql/horde_alarms.sql" name="scripts/sql/horde_alarms.sql" />
-   <install as="scripts/sql/horde_cache.pgsql.sql" name="scripts/sql/horde_cache.pgsql.sql" />
-   <install as="scripts/sql/horde_cache.sql" name="scripts/sql/horde_cache.sql" />
    <install as="scripts/sql/horde_datatree.mssql.sql" name="scripts/sql/horde_datatree.mssql.sql" />
    <install as="scripts/sql/horde_datatree.mysql.sql" name="scripts/sql/horde_datatree.mysql.sql" />
    <install as="scripts/sql/horde_datatree.pgsql.sql" name="scripts/sql/horde_datatree.pgsql.sql" />
    <install as="scripts/sql/horde_datatree.sql" name="scripts/sql/horde_datatree.sql" />
-   <install as="scripts/sql/horde_groups.mysql.sql" name="scripts/sql/horde_groups.mysql.sql" />
-   <install as="scripts/sql/horde_groups.oci8.sql" name="scripts/sql/horde_groups.oci8.sql" />
-   <install as="scripts/sql/horde_groups.pgsql.sql" name="scripts/sql/horde_groups.pgsql.sql" />
-   <install as="scripts/sql/horde_groups.sql" name="scripts/sql/horde_groups.sql" />
-   <install as="scripts/sql/horde_histories.mssql.sql" name="scripts/sql/horde_histories.mssql.sql" />
-   <install as="scripts/sql/horde_histories.sql" name="scripts/sql/horde_histories.sql" />
    <install as="scripts/sql/horde_locks.sql" name="scripts/sql/horde_locks.sql" />
    <install as="scripts/sql/horde_log.mssql.sql" name="scripts/sql/horde_log.mssql.sql" />
    <install as="scripts/sql/horde_log.sql" name="scripts/sql/horde_log.sql" />
@@ -2672,9 +2632,6 @@ applications.</description>
    <install as="scripts/upgrades/3.3_to_3.3.5.sql" name="scripts/upgrades/3.3_to_3.3.5.sql" />
    <install as="scripts/upgrades/2005-09-22_horde_prefs_varchar2.oci8.sql" name="scripts/upgrades/2005-09-22_horde_prefs_varchar2.oci8.sql" />
    <install as="scripts/upgrades/2006-06-29_horde_prefs_indexes.sql" name="scripts/upgrades/2006-06-29_horde_prefs_indexes.sql" />
-   <install as="scripts/upgrades/2007-02-21_horde_alarms_primary.sql" name="scripts/upgrades/2007-02-21_horde_alarms_primary.sql" />
-   <install as="scripts/upgrades/2007-04-25_horde_alarms_drop_primary.sql" name="scripts/upgrades/2007-04-25_horde_alarms_drop_primary.sql" />
-   <install as="scripts/upgrades/2007-05-24_horde_alarms_add_dismissed.sql" name="scripts/upgrades/2007-05-24_horde_alarms_add_dismissed.sql" />
    <install as="scripts/upgrades/2008-04-04_horde_syncml_map_split_indexes.pgsql.sql" name="scripts/upgrades/2008-04-04_horde_syncml_map_split_indexes.pgsql.sql" />
    <install as="scripts/upgrades/2008-04-04_horde_syncml_map_split_indexes.sql" name="scripts/upgrades/2008-04-04_horde_syncml_map_split_indexes.sql" />
    <install as="scripts/upgrades/2008-04-09_horde_syncml_map.php" name="scripts/upgrades/2008-04-09_horde_syncml_map.php" />
@@ -2686,14 +2643,9 @@ applications.</description>
    <install as="scripts/upgrades/2009-02-13_horde_sessionhandler_lastmodified_index.sql" name="scripts/upgrades/2009-02-13_horde_sessionhandler_lastmodified_index.sql" />
    <install as="scripts/upgrades/2009-04-13_horde_pgsql_upgrade.sql" name="scripts/upgrades/2009-04-13_horde_pgsql_upgrade.sql" />
    <install as="scripts/upgrades/2009-09-10_horde_signup_drop_email.sql" name="scripts/upgrades/2009-09-10_horde_signup_drop_email.sql" />
-   <install as="scripts/upgrades/2010-05-11_horde_activesync_adduserkey.sql" name="scripts/upgrades/2010-05-11_horde_activesync_adduserkey.sql" />
    <install as="scripts/upgrades/2010-05-24_horde_perms_autoincrement.mysql.sql" name="scripts/upgrades/2010-05-24_horde_perms_autoincrement.mysql.sql" />
    <install as="scripts/upgrades/2010-05-24_horde_perms_autoincrement.oci8.sql" name="scripts/upgrades/2010-05-24_horde_perms_autoincrement.oci8.sql" />
    <install as="scripts/upgrades/2010-05-24_horde_perms_autoincrement.pgsql.sql" name="scripts/upgrades/2010-05-24_horde_perms_autoincrement.pgsql.sql" />
-   <install as="scripts/upgrades/2010-06-01_horde_groups_autoincrement.mysql.sql" name="scripts/upgrades/2010-06-01_horde_groups_autoincrement.mysql.sql" />
-   <install as="scripts/upgrades/2010-06-01_horde_groups_autoincrement.oci8.sql" name="scripts/upgrades/2010-06-01_horde_groups_autoincrement.oci8.sql" />
-   <install as="scripts/upgrades/2010-06-01_horde_groups_autoincrement.pgsql.sql" name="scripts/upgrades/2010-06-01_horde_groups_autoincrement.pgsql.sql" />
-   <install as="scripts/upgrades/2010-06-22_activesync_fix_syncdata_type.mysql.sql" name="scripts/upgrades/2010-06-22_activesync_fix_syncdata_type.mysql.sql" />
    <install as="scripts/upgrades/convert_datatree_groups_to_sql.php" name="scripts/upgrades/convert_datatree_groups_to_sql.php" />
    <install as="scripts/upgrades/convert_datatree_perms_to_sql.php" name="scripts/upgrades/convert_datatree_perms_to_sql.php" />
    <install as="scripts/upgrades/migrate_user_categories.php" name="scripts/upgrades/migrate_user_categories.php" />
@@ -3824,7 +3776,7 @@ applications.</description>
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2011-01-24</date>
+   <date>2011-01-27</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
 * Initial package.xml.
diff --git a/imp/package.xml b/imp/package.xml
index 16526af0b..f9f72fe10 100644
--- a/imp/package.xml
+++ b/imp/package.xml
@@ -28,8 +28,8 @@ multiple folders, and multiple-language support.</description>
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2011-01-05</date>
- <time>13:59:34</time>
+ <date>2011-01-27</date>
+ <time>17:27:58</time>
  <version>
   <release>5.0.0</release>
   <api>5.0.0</api>
@@ -44,6 +44,10 @@ multiple folders, and multiple-language support.</description>
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
+   <dir name="bin">
+    <file name="bounce_spam" role="script" />
+    <file name="query_imap_cache" role="script" />
+   </dir> <!-- /bin -->
    <dir name="config">
     <file name="backends.php.dist" role="horde" />
     <file name="conf.xml" role="horde" />
@@ -108,6 +112,23 @@ multiple folders, and multiple-language support.</description>
      <file name="Pgp.php" role="horde" />
      <file name="Smime.php" role="horde" />
     </dir> <!-- /lib/Crypt -->
+    <dir name="Factory">
+     <file name="AuthImap.php" role="horde" />
+     <file name="Compose.php" role="horde" />
+     <file name="Contents.php" role="horde" />
+     <file name="Flags.php" role="horde" />
+     <file name="Identity.php" role="horde" />
+     <file name="Imap.php" role="horde" />
+     <file name="Imaptree.php" role="horde" />
+     <file name="Mail.php" role="horde" />
+     <file name="MailboxList.php" role="horde" />
+     <file name="MimeViewer.php" role="horde" />
+     <file name="Pgp.php" role="horde" />
+     <file name="Quota.php" role="horde" />
+     <file name="Search.php" role="horde" />
+     <file name="Sentmail.php" role="horde" />
+     <file name="Smime.php" role="horde" />
+    </dir> <!-- /lib/Factory -->
     <dir name="Flag">
      <dir name="Imap">
       <file name="Answered.php" role="horde" />
@@ -139,25 +160,6 @@ multiple folders, and multiple-language support.</description>
      <file name="Thread.php" role="horde" />
      <file name="Tree.php" role="horde" />
     </dir> <!-- /lib/Imap -->
-    <dir name="Injector">
-     <dir name="Factory">
-      <file name="AuthImap.php" role="horde" />
-      <file name="Compose.php" role="horde" />
-      <file name="Contents.php" role="horde" />
-      <file name="Flags.php" role="horde" />
-      <file name="Identity.php" role="horde" />
-      <file name="Imap.php" role="horde" />
-      <file name="Imaptree.php" role="horde" />
-      <file name="Mail.php" role="horde" />
-      <file name="MailboxList.php" role="horde" />
-      <file name="MimeViewer.php" role="horde" />
-      <file name="Pgp.php" role="horde" />
-      <file name="Quota.php" role="horde" />
-      <file name="Search.php" role="horde" />
-      <file name="Sentmail.php" role="horde" />
-      <file name="Smime.php" role="horde" />
-     </dir> <!-- /lib/Injector/Factory -->
-    </dir> <!-- /lib/Injector -->
     <dir name="LoginTasks">
      <dir name="SystemTask">
       <file name="GarbageCollection.php" role="horde" />
@@ -632,10 +634,6 @@ multiple folders, and multiple-language support.</description>
     <file name="1_imp_base_tables.php" role="horde" />
     <file name="2_imp_autoincrement_sentmail.php" role="horde" />
    </dir> <!-- /migration -->
-   <dir name="scripts">
-    <file name="bounce_spam.php" role="horde" />
-    <file name="query-imap-cache.php" role="horde" />
-   </dir> <!-- /scripts -->
    <dir name="templates">
     <dir name="dimp">
      <dir name="compose">
@@ -853,7 +851,7 @@ multiple folders, and multiple-language support.</description>
       <file name="forward.png" role="horde" />
       <file name="gallery.png" role="horde" />
       <file name="ham.png" role="horde" />
-      <file name="help.png" role="data" />
+      <file name="help.png" role="horde" />
       <file name="ico_message_off.png" role="horde" />
       <file name="imp.png" role="horde" />
       <file name="info_icon.png" role="horde" />
@@ -986,7 +984,7 @@ multiple folders, and multiple-language support.</description>
       <file name="filters.png" role="horde" />
       <file name="forward.png" role="horde" />
       <file name="ham.png" role="horde" />
-      <file name="help.png" role="data" />
+      <file name="help.png" role="horde" />
       <file name="imp.png" role="horde" />
       <file name="info_icon.png" role="horde" />
       <file name="locked.png" role="horde" />
@@ -1141,6 +1139,8 @@ multiple folders, and multiple-language support.</description>
  </usesrole>
  <phprelease>
   <filelist>
+   <install as="bounce_spam" name="bin/bounce_spam" />
+   <install as="query_imap_cache" name="bin/query_imap_cache" />
    <install as="imp/config/backends.php.dist" name="config/backends.php.dist" />
    <install as="imp/config/conf.xml" name="config/conf.xml" />
    <install as="imp/config/filter.txt.dist" name="config/filter.txt.dist" />
@@ -1209,6 +1209,21 @@ multiple folders, and multiple-language support.</description>
    <install as="imp/lib/Compose/Stationery.php" name="lib/Compose/Stationery.php" />
    <install as="imp/lib/Crypt/Pgp.php" name="lib/Crypt/Pgp.php" />
    <install as="imp/lib/Crypt/Smime.php" name="lib/Crypt/Smime.php" />
+   <install as="imp/lib/Factory/AuthImap.php" name="lib/Factory/AuthImap.php" />
+   <install as="imp/lib/Factory/Compose.php" name="lib/Factory/Compose.php" />
+   <install as="imp/lib/Factory/Contents.php" name="lib/Factory/Contents.php" />
+   <install as="imp/lib/Factory/Flags.php" name="lib/Factory/Flags.php" />
+   <install as="imp/lib/Factory/Identity.php" name="lib/Factory/Identity.php" />
+   <install as="imp/lib/Factory/Imap.php" name="lib/Factory/Imap.php" />
+   <install as="imp/lib/Factory/Imaptree.php" name="lib/Factory/Imaptree.php" />
+   <install as="imp/lib/Factory/Mail.php" name="lib/Factory/Mail.php" />
+   <install as="imp/lib/Factory/MailboxList.php" name="lib/Factory/MailboxList.php" />
+   <install as="imp/lib/Factory/MimeViewer.php" name="lib/Factory/MimeViewer.php" />
+   <install as="imp/lib/Factory/Pgp.php" name="lib/Factory/Pgp.php" />
+   <install as="imp/lib/Factory/Quota.php" name="lib/Factory/Quota.php" />
+   <install as="imp/lib/Factory/Search.php" name="lib/Factory/Search.php" />
+   <install as="imp/lib/Factory/Sentmail.php" name="lib/Factory/Sentmail.php" />
+   <install as="imp/lib/Factory/Smime.php" name="lib/Factory/Smime.php" />
    <install as="imp/lib/Flag/Base.php" name="lib/Flag/Base.php" />
    <install as="imp/lib/Flag/Imap.php" name="lib/Flag/Imap.php" />
    <install as="imp/lib/Flag/System.php" name="lib/Flag/System.php" />
@@ -1230,21 +1245,6 @@ multiple folders, and multiple-language support.</description>
    <install as="imp/lib/Imap/Thread.php" name="lib/Imap/Thread.php" />
    <install as="imp/lib/Imap/Tree.php" name="lib/Imap/Tree.php" />
    <install as="imp/lib/Imap/Tree/Element.php" name="lib/Imap/Tree/Element.php" />
-   <install as="imp/lib/Injector/Factory/AuthImap.php" name="lib/Injector/Factory/AuthImap.php" />
-   <install as="imp/lib/Injector/Factory/Compose.php" name="lib/Injector/Factory/Compose.php" />
-   <install as="imp/lib/Injector/Factory/Contents.php" name="lib/Injector/Factory/Contents.php" />
-   <install as="imp/lib/Injector/Factory/Flags.php" name="lib/Injector/Factory/Flags.php" />
-   <install as="imp/lib/Injector/Factory/Identity.php" name="lib/Injector/Factory/Identity.php" />
-   <install as="imp/lib/Injector/Factory/Imap.php" name="lib/Injector/Factory/Imap.php" />
-   <install as="imp/lib/Injector/Factory/Imaptree.php" name="lib/Injector/Factory/Imaptree.php" />
-   <install as="imp/lib/Injector/Factory/Mail.php" name="lib/Injector/Factory/Mail.php" />
-   <install as="imp/lib/Injector/Factory/MailboxList.php" name="lib/Injector/Factory/MailboxList.php" />
-   <install as="imp/lib/Injector/Factory/MimeViewer.php" name="lib/Injector/Factory/MimeViewer.php" />
-   <install as="imp/lib/Injector/Factory/Pgp.php" name="lib/Injector/Factory/Pgp.php" />
-   <install as="imp/lib/Injector/Factory/Quota.php" name="lib/Injector/Factory/Quota.php" />
-   <install as="imp/lib/Injector/Factory/Search.php" name="lib/Injector/Factory/Search.php" />
-   <install as="imp/lib/Injector/Factory/Sentmail.php" name="lib/Injector/Factory/Sentmail.php" />
-   <install as="imp/lib/Injector/Factory/Smime.php" name="lib/Injector/Factory/Smime.php" />
    <install as="imp/lib/LoginTasks/SystemTask/GarbageCollection.php" name="lib/LoginTasks/SystemTask/GarbageCollection.php" />
    <install as="imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php" name="lib/LoginTasks/SystemTask/UpgradeFromImp4.php" />
    <install as="imp/lib/LoginTasks/SystemTask/UpgradeFromImp4Auth.php" name="lib/LoginTasks/SystemTask/UpgradeFromImp4Auth.php" />
@@ -1455,8 +1455,6 @@ multiple folders, and multiple-language support.</description>
    <install as="imp/locale/zh_TW/LC_MESSAGES/imp.po" name="locale/zh_TW/LC_MESSAGES/imp.po" />
    <install as="imp/migration/1_imp_base_tables.php" name="migration/1_imp_base_tables.php" />
    <install as="imp/migration/2_imp_autoincrement_sentmail.php" name="migration/2_imp_autoincrement_sentmail.php" />
-   <install as="imp/scripts/bounce_spam.php" name="scripts/bounce_spam.php" />
-   <install as="imp/scripts/query-imap-cache.php" name="scripts/query-imap-cache.php" />
    <install as="imp/templates/common-header.inc" name="templates/common-header.inc" />
    <install as="imp/templates/dimp/index.inc" name="templates/dimp/index.inc" />
    <install as="imp/templates/dimp/javascript_defs.php" name="templates/dimp/javascript_defs.php" />
@@ -1805,7 +1803,7 @@ multiple folders, and multiple-language support.</description>
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2011-01-05</date>
+   <date>2011-01-27</date>
    <license uri="http://www.gnu.org/licenses/gpl.html">GPL</license>
    <notes>
 * Initial release.
diff --git a/kronolith/package.xml b/kronolith/package.xml
index 0bfbdec8b..d53fd2fcd 100644
--- a/kronolith/package.xml
+++ b/kronolith/package.xml
@@ -16,8 +16,8 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2011-01-25</date>
- <time>10:00:14</time>
+ <date>2011-01-27</date>
+ <time>17:28:44</time>
  <version>
   <release>3.0.0</release>
   <api>3.0.0</api>
@@ -33,789 +33,787 @@
  <contents>
   <dir baseinstalldir="/" name="/">
    <dir name="calendars">
-    <file baseinstalldir="/" name="create.php" role="horde" />
-    <file baseinstalldir="/" name="delete.php" role="horde" />
-    <file baseinstalldir="/" name="edit.php" role="horde" />
-    <file baseinstalldir="/" name="index.php" role="horde" />
-    <file baseinstalldir="/" name="info.php" role="horde" />
-    <file baseinstalldir="/" name="remote_edit.php" role="horde" />
-    <file baseinstalldir="/" name="remote_subscribe.php" role="horde" />
-    <file baseinstalldir="/" name="remote_unsubscribe.php" role="horde" />
-    <file baseinstalldir="/" name="subscribe.php" role="horde" />
+    <file name="create.php" role="horde" />
+    <file name="delete.php" role="horde" />
+    <file name="edit.php" role="horde" />
+    <file name="index.php" role="horde" />
+    <file name="info.php" role="horde" />
+    <file name="remote_edit.php" role="horde" />
+    <file name="remote_subscribe.php" role="horde" />
+    <file name="remote_unsubscribe.php" role="horde" />
+    <file name="subscribe.php" role="horde" />
    </dir> <!-- /calendars -->
    <dir name="config">
-    <file baseinstalldir="/" name="conf.xml" role="horde" />
-    <file baseinstalldir="/" name="hooks.php.dist" role="horde" />
-    <file baseinstalldir="/" name="menu.php.dist" role="horde" />
-    <file baseinstalldir="/" name="prefs.php.dist" role="horde" />
+    <file name="conf.xml" role="horde" />
+    <file name="hooks.php.dist" role="horde" />
+    <file name="menu.php.dist" role="horde" />
+    <file name="prefs.php.dist" role="horde" />
    </dir> <!-- /config -->
    <dir name="docs">
-    <file baseinstalldir="/" name="CHANGES" role="doc" />
-    <file baseinstalldir="/" name="CREDITS" role="doc" />
-    <file baseinstalldir="/" name="INSTALL" role="doc" />
-    <file baseinstalldir="/" name="lighttpd-kronolith.conf" role="doc" />
-    <file baseinstalldir="/" name="RELEASE_NOTES" role="doc" />
-    <file baseinstalldir="/" name="TODO" role="doc" />
-    <file baseinstalldir="/" name="UPGRADING" role="doc" />
+    <file name="CHANGES" role="doc" />
+    <file name="CREDITS" role="doc" />
+    <file name="INSTALL" role="doc" />
+    <file name="lighttpd-kronolith.conf" role="doc" />
+    <file name="RELEASE_NOTES" role="doc" />
+    <file name="TODO" role="doc" />
+    <file name="UPGRADING" role="doc" />
    </dir> <!-- /docs -->
    <dir name="feed">
-    <file baseinstalldir="/" name="index.php" role="horde" />
+    <file name="index.php" role="horde" />
    </dir> <!-- /feed -->
    <dir name="js">
-    <file baseinstalldir="/" name="calendar-panel.js" role="horde" />
-    <file baseinstalldir="/" name="edit.js" role="horde" />
-    <file baseinstalldir="/" name="embed.js" role="horde" />
-    <file baseinstalldir="/" name="goto.js" role="horde" />
-    <file baseinstalldir="/" name="kronolith.js" role="horde" />
-    <file baseinstalldir="/" name="mobile.js" role="horde" />
-    <file baseinstalldir="/" name="tagactions.js" role="horde" />
-    <file baseinstalldir="/" name="views.js" role="horde" />
+    <file name="calendar-panel.js" role="horde" />
+    <file name="edit.js" role="horde" />
+    <file name="embed.js" role="horde" />
+    <file name="goto.js" role="horde" />
+    <file name="kronolith.js" role="horde" />
+    <file name="mobile.js" role="horde" />
+    <file name="tagactions.js" role="horde" />
+    <file name="views.js" role="horde" />
    </dir> <!-- /js -->
    <dir name="lib">
     <dir name="Ajax">
      <dir name="Imple">
-      <file baseinstalldir="/" name="ContactAutoCompleter.php" role="horde" />
-      <file baseinstalldir="/" name="Embed.php" role="horde" />
-      <file baseinstalldir="/" name="TagActions.php" role="horde" />
-      <file baseinstalldir="/" name="TagAutoCompleter.php" role="horde" />
+      <file name="ContactAutoCompleter.php" role="horde" />
+      <file name="Embed.php" role="horde" />
+      <file name="TagActions.php" role="horde" />
+      <file name="TagAutoCompleter.php" role="horde" />
      </dir> <!-- /lib/Ajax/Imple -->
-     <file baseinstalldir="/" name="Application.php" role="horde" />
+     <file name="Application.php" role="horde" />
     </dir> <!-- /lib/Ajax -->
     <dir name="Block">
-     <file baseinstalldir="/" name="month.php" role="horde" />
-     <file baseinstalldir="/" name="monthlist.php" role="horde" />
-     <file baseinstalldir="/" name="prevmonthlist.php" role="horde" />
-     <file baseinstalldir="/" name="summary.php" role="horde" />
+     <file name="month.php" role="horde" />
+     <file name="monthlist.php" role="horde" />
+     <file name="prevmonthlist.php" role="horde" />
+     <file name="summary.php" role="horde" />
     </dir> <!-- /lib/Block -->
     <dir name="Calendar">
      <dir name="External">
-      <file baseinstalldir="/" name="Tasks.php" role="horde" />
+      <file name="Tasks.php" role="horde" />
      </dir> <!-- /lib/Calendar/External -->
-     <file baseinstalldir="/" name="External.php" role="horde" />
-     <file baseinstalldir="/" name="Holiday.php" role="horde" />
-     <file baseinstalldir="/" name="Internal.php" role="horde" />
-     <file baseinstalldir="/" name="Remote.php" role="horde" />
+     <file name="External.php" role="horde" />
+     <file name="Holiday.php" role="horde" />
+     <file name="Internal.php" role="horde" />
+     <file name="Remote.php" role="horde" />
     </dir> <!-- /lib/Calendar -->
     <dir name="Driver">
-     <file baseinstalldir="/" name="Holidays.php" role="horde" />
-     <file baseinstalldir="/" name="Horde.php" role="horde" />
-     <file baseinstalldir="/" name="Ical.php" role="horde" />
-     <file baseinstalldir="/" name="Kolab.php" role="horde" />
-     <file baseinstalldir="/" name="Resource.php" role="horde" />
-     <file baseinstalldir="/" name="Sql.php" role="horde" />
+     <file name="Holidays.php" role="horde" />
+     <file name="Horde.php" role="horde" />
+     <file name="Ical.php" role="horde" />
+     <file name="Kolab.php" role="horde" />
+     <file name="Resource.php" role="horde" />
+     <file name="Sql.php" role="horde" />
     </dir> <!-- /lib/Driver -->
     <dir name="Event">
-     <file baseinstalldir="/" name="Holidays.php" role="horde" />
-     <file baseinstalldir="/" name="Horde.php" role="horde" />
-     <file baseinstalldir="/" name="Ical.php" role="horde" />
-     <file baseinstalldir="/" name="Kolab.php" role="horde" />
-     <file baseinstalldir="/" name="Resource.php" role="horde" />
-     <file baseinstalldir="/" name="Sql.php" role="horde" />
+     <file name="Holidays.php" role="horde" />
+     <file name="Horde.php" role="horde" />
+     <file name="Ical.php" role="horde" />
+     <file name="Kolab.php" role="horde" />
+     <file name="Resource.php" role="horde" />
+     <file name="Sql.php" role="horde" />
     </dir> <!-- /lib/Event -->
+    <dir name="Factory">
+     <file name="Driver.php" role="horde" />
+     <file name="Geo.php" role="horde" />
+     <file name="Storage.php" role="horde" />
+    </dir> <!-- /lib/Factory -->
     <dir name="Forms">
-     <file baseinstalldir="/" name="CreateCalendar.php" role="horde" />
-     <file baseinstalldir="/" name="CreateResource.php" role="horde" />
-     <file baseinstalldir="/" name="CreateResourceGroup.php" role="horde" />
-     <file baseinstalldir="/" name="DeleteCalendar.php" role="horde" />
-     <file baseinstalldir="/" name="DeleteResource.php" role="horde" />
-     <file baseinstalldir="/" name="DeleteResourceGroup.php" role="horde" />
-     <file baseinstalldir="/" name="EditCalendar.php" role="horde" />
-     <file baseinstalldir="/" name="EditRemoteCalendar.php" role="horde" />
-     <file baseinstalldir="/" name="EditResource.php" role="horde" />
-     <file baseinstalldir="/" name="EditResourceGroup.php" role="horde" />
-     <file baseinstalldir="/" name="SubscribeRemoteCalendar.php" role="horde" />
-     <file baseinstalldir="/" name="UnsubscribeRemoteCalendar.php" role="horde" />
+     <file name="CreateCalendar.php" role="horde" />
+     <file name="CreateResource.php" role="horde" />
+     <file name="CreateResourceGroup.php" role="horde" />
+     <file name="DeleteCalendar.php" role="horde" />
+     <file name="DeleteResource.php" role="horde" />
+     <file name="DeleteResourceGroup.php" role="horde" />
+     <file name="EditCalendar.php" role="horde" />
+     <file name="EditRemoteCalendar.php" role="horde" />
+     <file name="EditResource.php" role="horde" />
+     <file name="EditResourceGroup.php" role="horde" />
+     <file name="SubscribeRemoteCalendar.php" role="horde" />
+     <file name="UnsubscribeRemoteCalendar.php" role="horde" />
     </dir> <!-- /lib/Forms -->
     <dir name="FreeBusy">
      <dir name="View">
-      <file baseinstalldir="/" name="Day.php" role="horde" />
-      <file baseinstalldir="/" name="Month.php" role="horde" />
-      <file baseinstalldir="/" name="Week.php" role="horde" />
-      <file baseinstalldir="/" name="Workweek.php" role="horde" />
+      <file name="Day.php" role="horde" />
+      <file name="Month.php" role="horde" />
+      <file name="Week.php" role="horde" />
+      <file name="Workweek.php" role="horde" />
      </dir> <!-- /lib/FreeBusy/View -->
-     <file baseinstalldir="/" name="View.php" role="horde" />
+     <file name="View.php" role="horde" />
     </dir> <!-- /lib/FreeBusy -->
     <dir name="Geo">
-     <file baseinstalldir="/" name="Base.php" role="horde" />
-     <file baseinstalldir="/" name="Mysql.php" role="horde" />
-     <file baseinstalldir="/" name="Sql.php" role="horde" />
+     <file name="Base.php" role="horde" />
+     <file name="Mysql.php" role="horde" />
+     <file name="Sql.php" role="horde" />
     </dir> <!-- /lib/Geo -->
-    <dir name="Injector">
-     <dir name="Factory">
-      <file baseinstalldir="/" name="Driver.php" role="horde" />
-      <file baseinstalldir="/" name="Geo.php" role="horde" />
-      <file baseinstalldir="/" name="Storage.php" role="horde" />
-     </dir> <!-- /lib/Injector/Factory -->
-    </dir> <!-- /lib/Injector -->
     <dir name="LoginTasks">
      <dir name="SystemTask">
-      <file baseinstalldir="/" name="UpgradeFromKronolith2.php" role="horde" />
+      <file name="UpgradeFromKronolith2.php" role="horde" />
      </dir> <!-- /lib/LoginTasks/SystemTask -->
      <dir name="Task">
-      <file baseinstalldir="/" name="PurgeEvents.php" role="horde" />
+      <file name="PurgeEvents.php" role="horde" />
      </dir> <!-- /lib/LoginTasks/Task -->
     </dir> <!-- /lib/LoginTasks -->
     <dir name="Notification">
      <dir name="Listener">
-      <file baseinstalldir="/" name="AjaxStatus.php" role="horde" />
+      <file name="AjaxStatus.php" role="horde" />
      </dir> <!-- /lib/Notification/Listener -->
     </dir> <!-- /lib/Notification -->
     <dir name="Resource">
-     <file baseinstalldir="/" name="Base.php" role="horde" />
-     <file baseinstalldir="/" name="Group.php" role="horde" />
-     <file baseinstalldir="/" name="Single.php" role="horde" />
+     <file name="Base.php" role="horde" />
+     <file name="Group.php" role="horde" />
+     <file name="Single.php" role="horde" />
     </dir> <!-- /lib/Resource -->
     <dir name="Storage">
-     <file baseinstalldir="/" name="kolab.php" role="horde" />
-     <file baseinstalldir="/" name="Kolab.php" role="horde" />
-     <file baseinstalldir="/" name="sql.php" role="horde" />
-     <file baseinstalldir="/" name="Sql.php" role="horde" />
+     <file name="Kolab.php" role="horde" />
+     <file name="Sql.php" role="horde" />
     </dir> <!-- /lib/Storage -->
     <dir name="tests">
-     <file baseinstalldir="/" name="allday.ics" role="data" />
-     <file baseinstalldir="/" name="allday.phpt" role="data" />
-     <file baseinstalldir="/" name="bug6031.phpt" role="data" />
-     <file baseinstalldir="/" name="bug7068.ics" role="data" />
-     <file baseinstalldir="/" name="bug7068.phpt" role="data" />
-     <file baseinstalldir="/" name="fromicalendar.ics" role="data" />
-     <file baseinstalldir="/" name="fromicalendar.phpt" role="data" />
-     <file baseinstalldir="/" name="toicalendar.phpt" role="data" />
+     <file name="allday.ics" role="data" />
+     <file name="allday.phpt" role="data" />
+     <file name="bug6031.phpt" role="data" />
+     <file name="bug7068.ics" role="data" />
+     <file name="bug7068.phpt" role="data" />
+     <file name="fromicalendar.ics" role="data" />
+     <file name="fromicalendar.phpt" role="data" />
+     <file name="toicalendar.phpt" role="data" />
     </dir> <!-- /lib/tests -->
     <dir name="View">
-     <file baseinstalldir="/" name="Day.php" role="horde" />
-     <file baseinstalldir="/" name="DeleteEvent.php" role="horde" />
-     <file baseinstalldir="/" name="EditEvent.php" role="horde" />
-     <file baseinstalldir="/" name="Event.php" role="horde" />
-     <file baseinstalldir="/" name="ExportEvent.php" role="horde" />
-     <file baseinstalldir="/" name="Month.php" role="horde" />
-     <file baseinstalldir="/" name="Week.php" role="horde" />
-     <file baseinstalldir="/" name="WorkWeek.php" role="horde" />
-     <file baseinstalldir="/" name="Year.php" role="horde" />
+     <file name="Day.php" role="horde" />
+     <file name="DeleteEvent.php" role="horde" />
+     <file name="EditEvent.php" role="horde" />
+     <file name="Event.php" role="horde" />
+     <file name="ExportEvent.php" role="horde" />
+     <file name="Month.php" role="horde" />
+     <file name="Week.php" role="horde" />
+     <file name="WorkWeek.php" role="horde" />
+     <file name="Year.php" role="horde" />
     </dir> <!-- /lib/View -->
-    <file baseinstalldir="/" name="Api.php" role="horde" />
-    <file baseinstalldir="/" name="Application.php" role="horde" />
-    <file baseinstalldir="/" name="Calendar.php" role="horde" />
-    <file baseinstalldir="/" name="Day.php" role="horde" />
-    <file baseinstalldir="/" name="Driver.php" role="horde" />
-    <file baseinstalldir="/" name="Event.php" role="horde" />
-    <file baseinstalldir="/" name="Exception.php" role="horde" />
-    <file baseinstalldir="/" name="FreeBusy.php" role="horde" />
-    <file baseinstalldir="/" name="Kronolith.php" role="horde" />
-    <file baseinstalldir="/" name="Resource.php" role="horde" />
-    <file baseinstalldir="/" name="Storage.php" role="horde" />
-    <file baseinstalldir="/" name="Tagger.php" role="horde" />
-    <file baseinstalldir="/" name="Test.php" role="horde" />
+    <file name="Api.php" role="horde" />
+    <file name="Application.php" role="horde" />
+    <file name="Calendar.php" role="horde" />
+    <file name="Day.php" role="horde" />
+    <file name="Driver.php" role="horde" />
+    <file name="Event.php" role="horde" />
+    <file name="Exception.php" role="horde" />
+    <file name="FreeBusy.php" role="horde" />
+    <file name="Kronolith.php" role="horde" />
+    <file name="Resource.php" role="horde" />
+    <file name="Storage.php" role="horde" />
+    <file name="Tagger.php" role="horde" />
+    <file name="Test.php" role="horde" />
    </dir> <!-- /lib -->
    <dir name="locale">
     <dir name="ar">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/ar/LC_MESSAGES -->
     </dir> <!-- /locale/ar -->
     <dir name="bg">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/bg/LC_MESSAGES -->
     </dir> <!-- /locale/bg -->
     <dir name="ca">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/ca/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/ca -->
     <dir name="cs">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/cs/LC_MESSAGES -->
     </dir> <!-- /locale/cs -->
     <dir name="da">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/da/LC_MESSAGES -->
     </dir> <!-- /locale/da -->
     <dir name="de">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/de/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/de -->
     <dir name="el">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/el/LC_MESSAGES -->
     </dir> <!-- /locale/el -->
     <dir name="en">
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/en -->
     <dir name="es">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/es/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/es -->
     <dir name="et">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/et/LC_MESSAGES -->
     </dir> <!-- /locale/et -->
     <dir name="eu">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/eu/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/eu -->
     <dir name="fi">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/fi/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/fi -->
     <dir name="fr">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/fr/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/fr -->
     <dir name="hr">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/hr/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/hr -->
     <dir name="hu">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/hu/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/hu -->
     <dir name="it">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/it/LC_MESSAGES -->
     </dir> <!-- /locale/it -->
     <dir name="ja">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/ja/LC_MESSAGES -->
     </dir> <!-- /locale/ja -->
     <dir name="ko">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/ko/LC_MESSAGES -->
     </dir> <!-- /locale/ko -->
     <dir name="lt">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/lt/LC_MESSAGES -->
     </dir> <!-- /locale/lt -->
     <dir name="lv">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/lv/LC_MESSAGES -->
     </dir> <!-- /locale/lv -->
     <dir name="nb">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/nb/LC_MESSAGES -->
     </dir> <!-- /locale/nb -->
     <dir name="nl">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/nl/LC_MESSAGES -->
     </dir> <!-- /locale/nl -->
     <dir name="nn">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/nn/LC_MESSAGES -->
     </dir> <!-- /locale/nn -->
     <dir name="pl">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/pl/LC_MESSAGES -->
     </dir> <!-- /locale/pl -->
     <dir name="pt">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/pt/LC_MESSAGES -->
     </dir> <!-- /locale/pt -->
     <dir name="pt_BR">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/pt_BR/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/pt_BR -->
     <dir name="ro">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/ro/LC_MESSAGES -->
     </dir> <!-- /locale/ro -->
     <dir name="ru">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/ru/LC_MESSAGES -->
     </dir> <!-- /locale/ru -->
     <dir name="sk">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/sk/LC_MESSAGES -->
     </dir> <!-- /locale/sk -->
     <dir name="sl">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/sl/LC_MESSAGES -->
     </dir> <!-- /locale/sl -->
     <dir name="sv">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/sv/LC_MESSAGES -->
     </dir> <!-- /locale/sv -->
     <dir name="tr">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/tr/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/tr -->
     <dir name="uk">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/uk/LC_MESSAGES -->
     </dir> <!-- /locale/uk -->
     <dir name="zh_CN">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/zh_CN/LC_MESSAGES -->
     </dir> <!-- /locale/zh_CN -->
     <dir name="zh_TW">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="kronolith.mo" role="horde" />
-      <file baseinstalldir="/" name="kronolith.po" role="horde" />
+      <file name="kronolith.mo" role="horde" />
+      <file name="kronolith.po" role="horde" />
      </dir> <!-- /locale/zh_TW/LC_MESSAGES -->
     </dir> <!-- /locale/zh_TW -->
-    <file baseinstalldir="/" name="kronolith.pot" role="horde" />
+    <file name="kronolith.pot" role="horde" />
    </dir> <!-- /locale -->
    <dir name="migration">
-    <file baseinstalldir="/" name="1_kronolith_base_tables.php" role="horde" />
-    <file baseinstalldir="/" name="2_kronolith_upgrade_autoincrement.php" role="horde" />
-    <file baseinstalldir="/" name="3_kronolith_upgrade_addallday.php" role="horde" />
-    <file baseinstalldir="/" name="4_kronolith_upgrade_addalarmmethods.php" role="horde" />
-    <file baseinstalldir="/" name="5_kronolith_upgrade_addcolor.php" role="horde" />
-    <file baseinstalldir="/" name="6_kronolith_upgrade_addresources.php" role="horde" />
-    <file baseinstalldir="/" name="7_kronolith_upgrade_resourceautoincrement.php" role="horde" />
-    <file baseinstalldir="/" name="8_kronolith_upgrade_addgeo.php" role="horde" />
-    <file baseinstalldir="/" name="9_kronolith_upgrade_addurl.php" role="horde" />
-    <file baseinstalldir="/" name="10_kronolith_upgrade_exceptions.php" role="horde" />
-    <file baseinstalldir="/" name="11_kronolith_upgrade_resourceemail.php" role="horde" />
-    <file baseinstalldir="/" name="12_kronolith_upgrade_addzoom.php" role="horde" />
-    <file baseinstalldir="/" name="13_kronolith_upgrade_systemshares.php" role="horde" />
-    <file baseinstalldir="/" name="14_kronolith_upgrade_missingresourcefield.php" role="horde" />
-    <file baseinstalldir="/" name="15_kronolith_upgrade_sqlng.php" role="horde" />
+    <file name="1_kronolith_base_tables.php" role="horde" />
+    <file name="2_kronolith_upgrade_autoincrement.php" role="horde" />
+    <file name="3_kronolith_upgrade_addallday.php" role="horde" />
+    <file name="4_kronolith_upgrade_addalarmmethods.php" role="horde" />
+    <file name="5_kronolith_upgrade_addcolor.php" role="horde" />
+    <file name="6_kronolith_upgrade_addresources.php" role="horde" />
+    <file name="7_kronolith_upgrade_resourceautoincrement.php" role="horde" />
+    <file name="8_kronolith_upgrade_addgeo.php" role="horde" />
+    <file name="9_kronolith_upgrade_addurl.php" role="horde" />
+    <file name="10_kronolith_upgrade_exceptions.php" role="horde" />
+    <file name="11_kronolith_upgrade_resourceemail.php" role="horde" />
+    <file name="12_kronolith_upgrade_addzoom.php" role="horde" />
+    <file name="13_kronolith_upgrade_systemshares.php" role="horde" />
+    <file name="14_kronolith_upgrade_missingresourcefield.php" role="horde" />
+    <file name="15_kronolith_upgrade_sqlng.php" role="horde" />
+    <file name="16_kronolith_upgrade_sqlhierarchical.php" role="horde" />
+    <file name="17_kronolith_upgrade_sqlnghierarchical.php" role="horde" />
    </dir> <!-- /migration -->
    <dir name="packaging">
     <dir name="redhat">
-     <file baseinstalldir="/" name="kronolith.conf" role="data" />
-     <file baseinstalldir="/" name="kronolith.README" role="data" />
-     <file baseinstalldir="/" name="kronolith.spec" role="data" />
+     <file name="kronolith.conf" role="data" />
+     <file name="kronolith.README" role="data" />
+     <file name="kronolith.spec" role="data" />
     </dir> <!-- /packaging/redhat -->
    </dir> <!-- /packaging -->
    <dir name="resources">
     <dir name="groups">
-     <file baseinstalldir="/" name="create.php" role="horde" />
-     <file baseinstalldir="/" name="delete.php" role="horde" />
-     <file baseinstalldir="/" name="edit.php" role="horde" />
-     <file baseinstalldir="/" name="index.php" role="horde" />
+     <file name="create.php" role="horde" />
+     <file name="delete.php" role="horde" />
+     <file name="edit.php" role="horde" />
+     <file name="index.php" role="horde" />
     </dir> <!-- /resources/groups -->
-    <file baseinstalldir="/" name="create.php" role="horde" />
-    <file baseinstalldir="/" name="delete.php" role="horde" />
-    <file baseinstalldir="/" name="edit.php" role="horde" />
-    <file baseinstalldir="/" name="index.php" role="horde" />
+    <file name="create.php" role="horde" />
+    <file name="delete.php" role="horde" />
+    <file name="edit.php" role="horde" />
+    <file name="index.php" role="horde" />
    </dir> <!-- /resources -->
    <dir name="scripts">
     <dir name="sql">
-     <file baseinstalldir="/" name="add_geo.mysql.sql" role="data" />
+     <file name="add_geo.mysql.sql" role="data" />
     </dir> <!-- /scripts/sql -->
     <dir name="upgrades">
-     <file baseinstalldir="/" name="convert_datatree_shares_to_sql.php" role="data" />
-     <file baseinstalldir="/" name="convert_sql_shares_to_sqlng.php" role="data" />
-     <file baseinstalldir="/" name="convert_to_utc.php" role="data" />
+     <file name="convert_datatree_shares_to_sql.php" role="data" />
+     <file name="convert_sql_shares_to_sqlng.php" role="data" />
+     <file name="convert_to_utc.php" role="data" />
     </dir> <!-- /scripts/upgrades -->
-    <file baseinstalldir="/" name="agenda.php" role="data" />
-    <file baseinstalldir="/" name="import_icals.php" role="data" />
-    <file baseinstalldir="/" name="import_squirrelmail_calendar.php" role="data" />
+    <file name="agenda.php" role="data" />
+    <file name="import_icals.php" role="data" />
+    <file name="import_squirrelmail_calendar.php" role="data" />
    </dir> <!-- /scripts -->
    <dir name="templates">
     <dir name="agenda">
-     <file baseinstalldir="/" name="notification.html.php" role="horde" />
-     <file baseinstalldir="/" name="notification.plain.php" role="horde" />
+     <file name="notification.html.php" role="horde" />
+     <file name="notification.plain.php" role="horde" />
     </dir> <!-- /templates/agenda -->
     <dir name="alarm">
-     <file baseinstalldir="/" name="mail.html.php" role="horde" />
-     <file baseinstalldir="/" name="mail.plain.php" role="horde" />
+     <file name="mail.html.php" role="horde" />
+     <file name="mail.plain.php" role="horde" />
     </dir> <!-- /templates/alarm -->
     <dir name="attendees">
-     <file baseinstalldir="/" name="attendees.inc" role="horde" />
+     <file name="attendees.inc" role="horde" />
     </dir> <!-- /templates/attendees -->
     <dir name="chunks">
-     <file baseinstalldir="/" name="calendar.php" role="horde" />
-     <file baseinstalldir="/" name="permissions.inc" role="horde" />
+     <file name="calendar.php" role="horde" />
+     <file name="permissions.inc" role="horde" />
     </dir> <!-- /templates/chunks -->
     <dir name="contacts">
-     <file baseinstalldir="/" name="contacts.inc" role="horde" />
+     <file name="contacts.inc" role="horde" />
     </dir> <!-- /templates/contacts -->
     <dir name="data">
-     <file baseinstalldir="/" name="export.inc" role="horde" />
-     <file baseinstalldir="/" name="import.inc" role="horde" />
+     <file name="export.inc" role="horde" />
+     <file name="import.inc" role="horde" />
     </dir> <!-- /templates/data -->
     <dir name="day">
-     <file baseinstalldir="/" name="all_day.inc" role="horde" />
-     <file baseinstalldir="/" name="head.inc" role="horde" />
-     <file baseinstalldir="/" name="head_side_by_side.inc" role="horde" />
-     <file baseinstalldir="/" name="rows.html" role="horde" />
+     <file name="all_day.inc" role="horde" />
+     <file name="head.inc" role="horde" />
+     <file name="head_side_by_side.inc" role="horde" />
+     <file name="rows.html" role="horde" />
     </dir> <!-- /templates/day -->
     <dir name="delete">
-     <file baseinstalldir="/" name="delete.inc" role="horde" />
-     <file baseinstalldir="/" name="one.inc" role="horde" />
+     <file name="delete.inc" role="horde" />
+     <file name="one.inc" role="horde" />
     </dir> <!-- /templates/delete -->
     <dir name="edit">
-     <file baseinstalldir="/" name="edit.inc" role="horde" />
-     <file baseinstalldir="/" name="edit_timespan.inc" role="horde" />
+     <file name="edit.inc" role="horde" />
+     <file name="edit_timespan.inc" role="horde" />
     </dir> <!-- /templates/edit -->
     <dir name="fbview">
-     <file baseinstalldir="/" name="busyblock.html" role="horde" />
-     <file baseinstalldir="/" name="emptyblock.html" role="horde" />
-     <file baseinstalldir="/" name="header.html" role="horde" />
-     <file baseinstalldir="/" name="legend.html" role="horde" />
-     <file baseinstalldir="/" name="meetingblock.html" role="horde" />
-     <file baseinstalldir="/" name="row.html" role="horde" />
-     <file baseinstalldir="/" name="section.html" role="horde" />
-     <file baseinstalldir="/" name="unknownblock.html" role="horde" />
+     <file name="busyblock.html" role="horde" />
+     <file name="emptyblock.html" role="horde" />
+     <file name="header.html" role="horde" />
+     <file name="legend.html" role="horde" />
+     <file name="meetingblock.html" role="horde" />
+     <file name="row.html" role="horde" />
+     <file name="section.html" role="horde" />
+     <file name="unknownblock.html" role="horde" />
     </dir> <!-- /templates/fbview -->
     <dir name="feeds">
-     <file baseinstalldir="/" name="atom.xml" role="horde" />
+     <file name="atom.xml" role="horde" />
     </dir> <!-- /templates/feeds -->
     <dir name="index">
-     <file baseinstalldir="/" name="agenda.inc" role="horde" />
-     <file baseinstalldir="/" name="day.inc" role="horde" />
-     <file baseinstalldir="/" name="edit.inc" role="horde" />
-     <file baseinstalldir="/" name="index.inc" role="horde" />
-     <file baseinstalldir="/" name="month.inc" role="horde" />
-     <file baseinstalldir="/" name="task.inc" role="horde" />
-     <file baseinstalldir="/" name="tasks.inc" role="horde" />
-     <file baseinstalldir="/" name="week.inc" role="horde" />
-     <file baseinstalldir="/" name="year.inc" role="horde" />
+     <file name="agenda.inc" role="horde" />
+     <file name="day.inc" role="horde" />
+     <file name="edit.inc" role="horde" />
+     <file name="index.inc" role="horde" />
+     <file name="month.inc" role="horde" />
+     <file name="task.inc" role="horde" />
+     <file name="tasks.inc" role="horde" />
+     <file name="week.inc" role="horde" />
+     <file name="year.inc" role="horde" />
     </dir> <!-- /templates/index -->
     <dir name="itip">
-     <file baseinstalldir="/" name="notification.html.php" role="horde" />
-     <file baseinstalldir="/" name="notification.plain.php" role="horde" />
+     <file name="notification.html.php" role="horde" />
+     <file name="notification.plain.php" role="horde" />
     </dir> <!-- /templates/itip -->
     <dir name="mobile">
-     <file baseinstalldir="/" name="day.html.php" role="horde" />
-     <file baseinstalldir="/" name="event.html.php" role="horde" />
-     <file baseinstalldir="/" name="head.html.php" role="horde" />
-     <file baseinstalldir="/" name="javascript_defs.php" role="horde" />
-     <file baseinstalldir="/" name="month.html.php" role="horde" />
-     <file baseinstalldir="/" name="notice.html.php" role="horde" />
-     <file baseinstalldir="/" name="summary.html.php" role="horde" />
+     <file name="day.html.php" role="horde" />
+     <file name="event.html.php" role="horde" />
+     <file name="head.html.php" role="horde" />
+     <file name="javascript_defs.php" role="horde" />
+     <file name="month.html.php" role="horde" />
+     <file name="notice.html.php" role="horde" />
+     <file name="summary.html.php" role="horde" />
     </dir> <!-- /templates/mobile -->
     <dir name="month">
-     <file baseinstalldir="/" name="head.inc" role="horde" />
-     <file baseinstalldir="/" name="head_side_by_side.inc" role="horde" />
+     <file name="head.inc" role="horde" />
+     <file name="head_side_by_side.inc" role="horde" />
     </dir> <!-- /templates/month -->
     <dir name="perms">
-     <file baseinstalldir="/" name="perms.inc" role="horde" />
+     <file name="perms.inc" role="horde" />
     </dir> <!-- /templates/perms -->
     <dir name="prefs">
-     <file baseinstalldir="/" name="defaultalarm.html" role="horde" />
+     <file name="defaultalarm.html" role="horde" />
     </dir> <!-- /templates/prefs -->
     <dir name="resources">
-     <file baseinstalldir="/" name="form-header.inc" role="horde" />
-     <file baseinstalldir="/" name="resource-form.php" role="horde" />
+     <file name="form-header.inc" role="horde" />
+     <file name="resource-form.php" role="horde" />
     </dir> <!-- /templates/resources -->
     <dir name="search">
-     <file baseinstalldir="/" name="empty.inc" role="horde" />
-     <file baseinstalldir="/" name="event_footers.inc" role="horde" />
-     <file baseinstalldir="/" name="event_headers.inc" role="horde" />
-     <file baseinstalldir="/" name="event_summaries.inc" role="horde" />
-     <file baseinstalldir="/" name="header.inc" role="horde" />
-     <file baseinstalldir="/" name="search.inc" role="horde" />
-     <file baseinstalldir="/" name="search_advanced.inc" role="horde" />
+     <file name="empty.inc" role="horde" />
+     <file name="event_footers.inc" role="horde" />
+     <file name="event_headers.inc" role="horde" />
+     <file name="event_summaries.inc" role="horde" />
+     <file name="header.inc" role="horde" />
+     <file name="search.inc" role="horde" />
+     <file name="search_advanced.inc" role="horde" />
     </dir> <!-- /templates/search -->
     <dir name="share">
-     <file baseinstalldir="/" name="notification.html.php" role="horde" />
-     <file baseinstalldir="/" name="notification.plain.php" role="horde" />
+     <file name="notification.html.php" role="horde" />
+     <file name="notification.plain.php" role="horde" />
     </dir> <!-- /templates/share -->
     <dir name="view">
-     <file baseinstalldir="/" name="view.inc" role="horde" />
+     <file name="view.inc" role="horde" />
     </dir> <!-- /templates/view -->
     <dir name="week">
-     <file baseinstalldir="/" name="head.inc" role="horde" />
-     <file baseinstalldir="/" name="head_side_by_side.inc" role="horde" />
+     <file name="head.inc" role="horde" />
+     <file name="head_side_by_side.inc" role="horde" />
     </dir> <!-- /templates/week -->
     <dir name="year">
-     <file baseinstalldir="/" name="head.inc" role="horde" />
+     <file name="head.inc" role="horde" />
     </dir> <!-- /templates/year -->
-    <file baseinstalldir="/" name="calendar_info.php" role="horde" />
-    <file baseinstalldir="/" name="calendar_list.php" role="horde" />
-    <file baseinstalldir="/" name="calendar_titles.inc" role="horde" />
-    <file baseinstalldir="/" name="javascript_defs.php" role="horde" />
-    <file baseinstalldir="/" name="panel.inc" role="horde" />
+    <file name="calendar_info.php" role="horde" />
+    <file name="calendar_list.php" role="horde" />
+    <file name="calendar_titles.inc" role="horde" />
+    <file name="javascript_defs.php" role="horde" />
+    <file name="panel.inc" role="horde" />
    </dir> <!-- /templates -->
    <dir name="themes">
     <dir name="bluewhite">
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/bluewhite -->
     <dir name="burntorange">
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/burntorange -->
     <dir name="default">
      <dir name="graphics">
       <dir name="alerts">
-       <file baseinstalldir="/" name="alarm.png" role="horde" />
-       <file baseinstalldir="/" name="error.png" role="horde" />
-       <file baseinstalldir="/" name="message.png" role="horde" />
-       <file baseinstalldir="/" name="success.png" role="horde" />
-       <file baseinstalldir="/" name="warning.png" role="horde" />
+       <file name="alarm.png" role="horde" />
+       <file name="error.png" role="horde" />
+       <file name="message.png" role="horde" />
+       <file name="success.png" role="horde" />
+       <file name="warning.png" role="horde" />
       </dir> <!-- /themes/default/graphics/alerts -->
-      <file baseinstalldir="/" name="addressbook_browse.png" role="horde" />
-      <file baseinstalldir="/" name="agenda.png" role="horde" />
-      <file baseinstalldir="/" name="alarm-000.png" role="horde" />
-      <file baseinstalldir="/" name="alarm-fff.png" role="horde" />
-      <file baseinstalldir="/" name="alarm.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-accepted.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-declined.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-none.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-tentative.png" role="horde" />
-      <file baseinstalldir="/" name="attendees-000.png" role="horde" />
-      <file baseinstalldir="/" name="attendees-fff.png" role="horde" />
-      <file baseinstalldir="/" name="attendees.png" role="horde" />
-      <file baseinstalldir="/" name="back_quick.png" role="horde" />
-      <file baseinstalldir="/" name="big_agenda.png" role="horde" />
-      <file baseinstalldir="/" name="big_alarm.png" role="horde" />
-      <file baseinstalldir="/" name="big_invitation.png" role="horde" />
-      <file baseinstalldir="/" name="big_share.png" role="horde" />
-      <file baseinstalldir="/" name="calendars.png" role="horde" />
-      <file baseinstalldir="/" name="checkbox_off.png" role="horde" />
-      <file baseinstalldir="/" name="checkbox_on.png" role="horde" />
-      <file baseinstalldir="/" name="checkbox_over.png" role="horde" />
-      <file baseinstalldir="/" name="close.png" role="horde" />
-      <file baseinstalldir="/" name="dayview.png" role="horde" />
-      <file baseinstalldir="/" name="delete-000.png" role="horde" />
-      <file baseinstalldir="/" name="delete-fff.png" role="horde" />
-      <file baseinstalldir="/" name="drag-handle.png" role="horde" />
-      <file baseinstalldir="/" name="edit-000.png" role="horde" />
-      <file baseinstalldir="/" name="edit-fff.png" role="horde" />
-      <file baseinstalldir="/" name="exception-000.png" role="horde" />
-      <file baseinstalldir="/" name="exception-fff.png" role="horde" />
-      <file baseinstalldir="/" name="favicon.ico" role="horde" />
-      <file baseinstalldir="/" name="goto.png" role="horde" />
-      <file baseinstalldir="/" name="kronolith.png" role="horde" />
-      <file baseinstalldir="/" name="left.png" role="horde" />
-      <file baseinstalldir="/" name="loading.gif" role="horde" />
-      <file baseinstalldir="/" name="minus.png" role="horde" />
-      <file baseinstalldir="/" name="monthview.png" role="horde" />
-      <file baseinstalldir="/" name="new.png" role="horde" />
-      <file baseinstalldir="/" name="new_big.png" role="horde" />
-      <file baseinstalldir="/" name="new_small.png" role="horde" />
-      <file baseinstalldir="/" name="new_small_fade.png" role="horde" />
-      <file baseinstalldir="/" name="new_task.png" role="horde" />
-      <file baseinstalldir="/" name="picker.png" role="horde" />
-      <file baseinstalldir="/" name="plus.png" role="horde" />
-      <file baseinstalldir="/" name="print.png" role="horde" />
-      <file baseinstalldir="/" name="private-000.png" role="horde" />
-      <file baseinstalldir="/" name="private-fff.png" role="horde" />
-      <file baseinstalldir="/" name="recur-000.png" role="horde" />
-      <file baseinstalldir="/" name="recur-fff.png" role="horde" />
-      <file baseinstalldir="/" name="right.png" role="horde" />
-      <file baseinstalldir="/" name="search.png" role="horde" />
-      <file baseinstalldir="/" name="tasks.png" role="horde" />
-      <file baseinstalldir="/" name="today.png" role="horde" />
-      <file baseinstalldir="/" name="unknown-background.png" role="horde" />
-      <file baseinstalldir="/" name="weekview.png" role="horde" />
-      <file baseinstalldir="/" name="workweekview.png" role="horde" />
-      <file baseinstalldir="/" name="yearview.png" role="horde" />
+      <file name="addressbook_browse.png" role="horde" />
+      <file name="agenda.png" role="horde" />
+      <file name="alarm-000.png" role="horde" />
+      <file name="alarm-fff.png" role="horde" />
+      <file name="alarm.png" role="horde" />
+      <file name="attendee-accepted.png" role="horde" />
+      <file name="attendee-declined.png" role="horde" />
+      <file name="attendee-none.png" role="horde" />
+      <file name="attendee-tentative.png" role="horde" />
+      <file name="attendees-000.png" role="horde" />
+      <file name="attendees-fff.png" role="horde" />
+      <file name="attendees.png" role="horde" />
+      <file name="back_quick.png" role="horde" />
+      <file name="big_agenda.png" role="horde" />
+      <file name="big_alarm.png" role="horde" />
+      <file name="big_invitation.png" role="horde" />
+      <file name="big_share.png" role="horde" />
+      <file name="calendars.png" role="horde" />
+      <file name="checkbox_off.png" role="horde" />
+      <file name="checkbox_on.png" role="horde" />
+      <file name="checkbox_over.png" role="horde" />
+      <file name="close.png" role="horde" />
+      <file name="dayview.png" role="horde" />
+      <file name="delete-000.png" role="horde" />
+      <file name="delete-fff.png" role="horde" />
+      <file name="drag-handle.png" role="horde" />
+      <file name="edit-000.png" role="horde" />
+      <file name="edit-fff.png" role="horde" />
+      <file name="exception-000.png" role="horde" />
+      <file name="exception-fff.png" role="horde" />
+      <file name="favicon.ico" role="horde" />
+      <file name="goto.png" role="horde" />
+      <file name="kronolith.png" role="horde" />
+      <file name="left.png" role="horde" />
+      <file name="loading.gif" role="horde" />
+      <file name="minus.png" role="horde" />
+      <file name="monthview.png" role="horde" />
+      <file name="new.png" role="horde" />
+      <file name="new_big.png" role="horde" />
+      <file name="new_small.png" role="horde" />
+      <file name="new_small_fade.png" role="horde" />
+      <file name="new_task.png" role="horde" />
+      <file name="picker.png" role="horde" />
+      <file name="plus.png" role="horde" />
+      <file name="print.png" role="horde" />
+      <file name="private-000.png" role="horde" />
+      <file name="private-fff.png" role="horde" />
+      <file name="recur-000.png" role="horde" />
+      <file name="recur-fff.png" role="horde" />
+      <file name="right.png" role="horde" />
+      <file name="search.png" role="horde" />
+      <file name="tasks.png" role="horde" />
+      <file name="today.png" role="horde" />
+      <file name="unknown-background.png" role="horde" />
+      <file name="weekview.png" role="horde" />
+      <file name="workweekview.png" role="horde" />
+      <file name="yearview.png" role="horde" />
      </dir> <!-- /themes/default/graphics -->
-     <file baseinstalldir="/" name="embed.css" role="horde" />
-     <file baseinstalldir="/" name="ie7.css" role="horde" />
-     <file baseinstalldir="/" name="ie8.css" role="horde" />
-     <file baseinstalldir="/" name="mobile.css" role="horde" />
-     <file baseinstalldir="/" name="opera.css" role="horde" />
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="embed.css" role="horde" />
+     <file name="ie7.css" role="horde" />
+     <file name="ie8.css" role="horde" />
+     <file name="mobile.css" role="horde" />
+     <file name="opera.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/default -->
     <dir name="fadetogreen">
      <dir name="graphics">
-      <file baseinstalldir="/" name="headerbox.png" role="horde" />
+      <file name="headerbox.png" role="horde" />
      </dir> <!-- /themes/fadetogreen/graphics -->
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/fadetogreen -->
     <dir name="mozilla">
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/mozilla -->
     <dir name="silver">
      <dir name="graphics">
       <dir name="alerts">
-       <file baseinstalldir="/" name="alarm.png" role="horde" />
-       <file baseinstalldir="/" name="error.png" role="horde" />
-       <file baseinstalldir="/" name="message.png" role="horde" />
-       <file baseinstalldir="/" name="success.png" role="horde" />
-       <file baseinstalldir="/" name="warning.png" role="horde" />
+       <file name="alarm.png" role="horde" />
+       <file name="error.png" role="horde" />
+       <file name="message.png" role="horde" />
+       <file name="success.png" role="horde" />
+       <file name="warning.png" role="horde" />
       </dir> <!-- /themes/silver/graphics/alerts -->
-      <file baseinstalldir="/" name="addressbook_browse.png" role="horde" />
-      <file baseinstalldir="/" name="alarm-000.png" role="horde" />
-      <file baseinstalldir="/" name="alarm-fff.png" role="horde" />
-      <file baseinstalldir="/" name="alarm.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-accepted.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-declined.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-none.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-tentative.png" role="horde" />
-      <file baseinstalldir="/" name="attendees-000.png" role="horde" />
-      <file baseinstalldir="/" name="attendees-fff.png" role="horde" />
-      <file baseinstalldir="/" name="attendees.png" role="horde" />
-      <file baseinstalldir="/" name="calendars.png" role="horde" />
-      <file baseinstalldir="/" name="close.png" role="horde" />
-      <file baseinstalldir="/" name="dayview.png" role="horde" />
-      <file baseinstalldir="/" name="delete-000.png" role="horde" />
-      <file baseinstalldir="/" name="delete-fff.png" role="horde" />
-      <file baseinstalldir="/" name="edit-000.png" role="horde" />
-      <file baseinstalldir="/" name="edit-fff.png" role="horde" />
-      <file baseinstalldir="/" name="exception-000.png" role="horde" />
-      <file baseinstalldir="/" name="exception-fff.png" role="horde" />
-      <file baseinstalldir="/" name="favicon.ico" role="horde" />
-      <file baseinstalldir="/" name="goto.png" role="horde" />
-      <file baseinstalldir="/" name="kronolith.png" role="horde" />
-      <file baseinstalldir="/" name="loading.gif" role="horde" />
-      <file baseinstalldir="/" name="minus.png" role="horde" />
-      <file baseinstalldir="/" name="monthview.png" role="horde" />
-      <file baseinstalldir="/" name="new.png" role="horde" />
-      <file baseinstalldir="/" name="new_big.png" role="horde" />
-      <file baseinstalldir="/" name="new_small.png" role="horde" />
-      <file baseinstalldir="/" name="picker.png" role="horde" />
-      <file baseinstalldir="/" name="plus.png" role="horde" />
-      <file baseinstalldir="/" name="print.png" role="horde" />
-      <file baseinstalldir="/" name="private-000.png" role="horde" />
-      <file baseinstalldir="/" name="private-fff.png" role="horde" />
-      <file baseinstalldir="/" name="recur-000.png" role="horde" />
-      <file baseinstalldir="/" name="recur-fff.png" role="horde" />
-      <file baseinstalldir="/" name="search.png" role="horde" />
-      <file baseinstalldir="/" name="today.png" role="horde" />
-      <file baseinstalldir="/" name="unknown-background.png" role="horde" />
-      <file baseinstalldir="/" name="weekview.png" role="horde" />
-      <file baseinstalldir="/" name="workweekview.png" role="horde" />
-      <file baseinstalldir="/" name="yearview.png" role="horde" />
+      <file name="addressbook_browse.png" role="horde" />
+      <file name="alarm-000.png" role="horde" />
+      <file name="alarm-fff.png" role="horde" />
+      <file name="alarm.png" role="horde" />
+      <file name="attendee-accepted.png" role="horde" />
+      <file name="attendee-declined.png" role="horde" />
+      <file name="attendee-none.png" role="horde" />
+      <file name="attendee-tentative.png" role="horde" />
+      <file name="attendees-000.png" role="horde" />
+      <file name="attendees-fff.png" role="horde" />
+      <file name="attendees.png" role="horde" />
+      <file name="calendars.png" role="horde" />
+      <file name="close.png" role="horde" />
+      <file name="dayview.png" role="horde" />
+      <file name="delete-000.png" role="horde" />
+      <file name="delete-fff.png" role="horde" />
+      <file name="edit-000.png" role="horde" />
+      <file name="edit-fff.png" role="horde" />
+      <file name="exception-000.png" role="horde" />
+      <file name="exception-fff.png" role="horde" />
+      <file name="favicon.ico" role="horde" />
+      <file name="goto.png" role="horde" />
+      <file name="kronolith.png" role="horde" />
+      <file name="loading.gif" role="horde" />
+      <file name="minus.png" role="horde" />
+      <file name="monthview.png" role="horde" />
+      <file name="new.png" role="horde" />
+      <file name="new_big.png" role="horde" />
+      <file name="new_small.png" role="horde" />
+      <file name="picker.png" role="horde" />
+      <file name="plus.png" role="horde" />
+      <file name="print.png" role="horde" />
+      <file name="private-000.png" role="horde" />
+      <file name="private-fff.png" role="horde" />
+      <file name="recur-000.png" role="horde" />
+      <file name="recur-fff.png" role="horde" />
+      <file name="search.png" role="horde" />
+      <file name="today.png" role="horde" />
+      <file name="unknown-background.png" role="horde" />
+      <file name="weekview.png" role="horde" />
+      <file name="workweekview.png" role="horde" />
+      <file name="yearview.png" role="horde" />
      </dir> <!-- /themes/silver/graphics -->
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/silver -->
     <dir name="simplex">
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/simplex -->
     <dir name="tango-blue">
      <dir name="graphics">
       <dir name="alerts">
-       <file baseinstalldir="/" name="alarm.png" role="horde" />
-       <file baseinstalldir="/" name="error.png" role="horde" />
-       <file baseinstalldir="/" name="message.png" role="horde" />
-       <file baseinstalldir="/" name="success.png" role="horde" />
-       <file baseinstalldir="/" name="warning.png" role="horde" />
+       <file name="alarm.png" role="horde" />
+       <file name="error.png" role="horde" />
+       <file name="message.png" role="horde" />
+       <file name="success.png" role="horde" />
+       <file name="warning.png" role="horde" />
       </dir> <!-- /themes/tango-blue/graphics/alerts -->
-      <file baseinstalldir="/" name="addressbook_browse.png" role="horde" />
-      <file baseinstalldir="/" name="alarm-000.png" role="horde" />
-      <file baseinstalldir="/" name="alarm-fff.png" role="horde" />
-      <file baseinstalldir="/" name="alarm.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-accepted.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-declined.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-none.png" role="horde" />
-      <file baseinstalldir="/" name="attendee-tentative.png" role="horde" />
-      <file baseinstalldir="/" name="attendees-000.png" role="horde" />
-      <file baseinstalldir="/" name="attendees-fff.png" role="horde" />
-      <file baseinstalldir="/" name="attendees.png" role="horde" />
-      <file baseinstalldir="/" name="calendars.png" role="horde" />
-      <file baseinstalldir="/" name="close.png" role="horde" />
-      <file baseinstalldir="/" name="dayview.png" role="horde" />
-      <file baseinstalldir="/" name="delete-000.png" role="horde" />
-      <file baseinstalldir="/" name="delete-fff.png" role="horde" />
-      <file baseinstalldir="/" name="edit-000.png" role="horde" />
-      <file baseinstalldir="/" name="edit-fff.png" role="horde" />
-      <file baseinstalldir="/" name="exception-000.png" role="horde" />
-      <file baseinstalldir="/" name="exception-fff.png" role="horde" />
-      <file baseinstalldir="/" name="favicon.ico" role="horde" />
-      <file baseinstalldir="/" name="goto.png" role="horde" />
-      <file baseinstalldir="/" name="kronolith.png" role="horde" />
-      <file baseinstalldir="/" name="loading.gif" role="horde" />
-      <file baseinstalldir="/" name="minus.png" role="horde" />
-      <file baseinstalldir="/" name="monthview.png" role="horde" />
-      <file baseinstalldir="/" name="new.png" role="horde" />
-      <file baseinstalldir="/" name="new_big.png" role="horde" />
-      <file baseinstalldir="/" name="new_small.png" role="horde" />
-      <file baseinstalldir="/" name="picker.png" role="horde" />
-      <file baseinstalldir="/" name="plus.png" role="horde" />
-      <file baseinstalldir="/" name="print.png" role="horde" />
-      <file baseinstalldir="/" name="private-000.png" role="horde" />
-      <file baseinstalldir="/" name="private-fff.png" role="horde" />
-      <file baseinstalldir="/" name="recur-000.png" role="horde" />
-      <file baseinstalldir="/" name="recur-fff.png" role="horde" />
-      <file baseinstalldir="/" name="search.png" role="horde" />
-      <file baseinstalldir="/" name="today.png" role="horde" />
-      <file baseinstalldir="/" name="unknown-background.png" role="horde" />
-      <file baseinstalldir="/" name="weekview.png" role="horde" />
-      <file baseinstalldir="/" name="workweekview.png" role="horde" />
-      <file baseinstalldir="/" name="yearview.png" role="horde" />
+      <file name="addressbook_browse.png" role="horde" />
+      <file name="alarm-000.png" role="horde" />
+      <file name="alarm-fff.png" role="horde" />
+      <file name="alarm.png" role="horde" />
+      <file name="attendee-accepted.png" role="horde" />
+      <file name="attendee-declined.png" role="horde" />
+      <file name="attendee-none.png" role="horde" />
+      <file name="attendee-tentative.png" role="horde" />
+      <file name="attendees-000.png" role="horde" />
+      <file name="attendees-fff.png" role="horde" />
+      <file name="attendees.png" role="horde" />
+      <file name="calendars.png" role="horde" />
+      <file name="close.png" role="horde" />
+      <file name="dayview.png" role="horde" />
+      <file name="delete-000.png" role="horde" />
+      <file name="delete-fff.png" role="horde" />
+      <file name="edit-000.png" role="horde" />
+      <file name="edit-fff.png" role="horde" />
+      <file name="exception-000.png" role="horde" />
+      <file name="exception-fff.png" role="horde" />
+      <file name="favicon.ico" role="horde" />
+      <file name="goto.png" role="horde" />
+      <file name="kronolith.png" role="horde" />
+      <file name="loading.gif" role="horde" />
+      <file name="minus.png" role="horde" />
+      <file name="monthview.png" role="horde" />
+      <file name="new.png" role="horde" />
+      <file name="new_big.png" role="horde" />
+      <file name="new_small.png" role="horde" />
+      <file name="picker.png" role="horde" />
+      <file name="plus.png" role="horde" />
+      <file name="print.png" role="horde" />
+      <file name="private-000.png" role="horde" />
+      <file name="private-fff.png" role="horde" />
+      <file name="recur-000.png" role="horde" />
+      <file name="recur-fff.png" role="horde" />
+      <file name="search.png" role="horde" />
+      <file name="today.png" role="horde" />
+      <file name="unknown-background.png" role="horde" />
+      <file name="weekview.png" role="horde" />
+      <file name="workweekview.png" role="horde" />
+      <file name="yearview.png" role="horde" />
      </dir> <!-- /themes/tango-blue/graphics -->
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/tango-blue -->
    </dir> <!-- /themes -->
-   <file baseinstalldir="/" name="add.php" role="horde" />
-   <file baseinstalldir="/" name="attend.php" role="horde" />
-   <file baseinstalldir="/" name="attendees.php" role="horde" />
-   <file baseinstalldir="/" name="contacts.php" role="horde" />
-   <file baseinstalldir="/" name="COPYING" role="data" />
-   <file baseinstalldir="/" name="data.php" role="horde" />
-   <file baseinstalldir="/" name="day.php" role="horde" />
-   <file baseinstalldir="/" name="delete.php" role="horde" />
-   <file baseinstalldir="/" name="edit.php" role="horde" />
-   <file baseinstalldir="/" name="event.php" role="horde" />
-   <file baseinstalldir="/" name="fb.php" role="horde" />
-   <file baseinstalldir="/" name="index.php" role="horde" />
-   <file baseinstalldir="/" name="mobile.php" role="horde" />
-   <file baseinstalldir="/" name="month.php" role="horde" />
-   <file baseinstalldir="/" name="new.php" role="horde" />
-   <file baseinstalldir="/" name="perms.php" role="horde" />
-   <file baseinstalldir="/" name="README" role="data" />
-   <file baseinstalldir="/" name="search.php" role="horde" />
-   <file baseinstalldir="/" name="view.php" role="horde" />
-   <file baseinstalldir="/" name="week.php" role="horde" />
-   <file baseinstalldir="/" name="workweek.php" role="horde" />
-   <file baseinstalldir="/" name="year.php" role="horde" />
+   <file name="add.php" role="horde" />
+   <file name="attend.php" role="horde" />
+   <file name="attendees.php" role="horde" />
+   <file name="contacts.php" role="horde" />
+   <file name="COPYING" role="data" />
+   <file name="data.php" role="horde" />
+   <file name="day.php" role="horde" />
+   <file name="delete.php" role="horde" />
+   <file name="edit.php" role="horde" />
+   <file name="event.php" role="horde" />
+   <file name="fb.php" role="horde" />
+   <file name="index.php" role="horde" />
+   <file name="mobile.php" role="horde" />
+   <file name="month.php" role="horde" />
+   <file name="new.php" role="horde" />
+   <file name="perms.php" role="horde" />
+   <file name="README" role="data" />
+   <file name="search.php" role="horde" />
+   <file name="view.php" role="horde" />
+   <file name="week.php" role="horde" />
+   <file name="workweek.php" role="horde" />
+   <file name="year.php" role="horde" />
   </dir> <!-- / -->
  </contents>
  <dependencies>
@@ -915,6 +913,9 @@
    <install as="kronolith/lib/Event/Kolab.php" name="lib/Event/Kolab.php" />
    <install as="kronolith/lib/Event/Resource.php" name="lib/Event/Resource.php" />
    <install as="kronolith/lib/Event/Sql.php" name="lib/Event/Sql.php" />
+   <install as="kronolith/lib/Factory/Driver.php" name="lib/Factory/Driver.php" />
+   <install as="kronolith/lib/Factory/Geo.php" name="lib/Factory/Geo.php" />
+   <install as="kronolith/lib/Factory/Storage.php" name="lib/Factory/Storage.php" />
    <install as="kronolith/lib/Forms/CreateCalendar.php" name="lib/Forms/CreateCalendar.php" />
    <install as="kronolith/lib/Forms/CreateResource.php" name="lib/Forms/CreateResource.php" />
    <install as="kronolith/lib/Forms/CreateResourceGroup.php" name="lib/Forms/CreateResourceGroup.php" />
@@ -935,19 +936,14 @@
    <install as="kronolith/lib/Geo/Base.php" name="lib/Geo/Base.php" />
    <install as="kronolith/lib/Geo/Mysql.php" name="lib/Geo/Mysql.php" />
    <install as="kronolith/lib/Geo/Sql.php" name="lib/Geo/Sql.php" />
-   <install as="kronolith/lib/Injector/Factory/Driver.php" name="lib/Injector/Factory/Driver.php" />
-   <install as="kronolith/lib/Injector/Factory/Geo.php" name="lib/Injector/Factory/Geo.php" />
-   <install as="kronolith/lib/Injector/Factory/Storage.php" name="lib/Injector/Factory/Storage.php" />
    <install as="kronolith/lib/LoginTasks/SystemTask/UpgradeFromKronolith2.php" name="lib/LoginTasks/SystemTask/UpgradeFromKronolith2.php" />
    <install as="kronolith/lib/LoginTasks/Task/PurgeEvents.php" name="lib/LoginTasks/Task/PurgeEvents.php" />
    <install as="kronolith/lib/Notification/Listener/AjaxStatus.php" name="lib/Notification/Listener/AjaxStatus.php" />
    <install as="kronolith/lib/Resource/Base.php" name="lib/Resource/Base.php" />
    <install as="kronolith/lib/Resource/Group.php" name="lib/Resource/Group.php" />
    <install as="kronolith/lib/Resource/Single.php" name="lib/Resource/Single.php" />
-   <install as="kronolith/lib/Storage/kolab.php" name="lib/Storage/kolab.php" />
    <install as="kronolith/lib/Storage/Kolab.php" name="lib/Storage/Kolab.php" />
    <install as="kronolith/lib/Storage/Sql.php" name="lib/Storage/Sql.php" />
-   <install as="kronolith/lib/Storage/sql.php" name="lib/Storage/sql.php" />
    <install as="tests/allday.ics" name="lib/tests/allday.ics" />
    <install as="tests/allday.phpt" name="lib/tests/allday.phpt" />
    <install as="tests/bug6031.phpt" name="lib/tests/bug6031.phpt" />
@@ -1060,6 +1056,8 @@
    <install as="kronolith/migration/13_kronolith_upgrade_systemshares.php" name="migration/13_kronolith_upgrade_systemshares.php" />
    <install as="kronolith/migration/14_kronolith_upgrade_missingresourcefield.php" name="migration/14_kronolith_upgrade_missingresourcefield.php" />
    <install as="kronolith/migration/15_kronolith_upgrade_sqlng.php" name="migration/15_kronolith_upgrade_sqlng.php" />
+   <install as="kronolith/migration/16_kronolith_upgrade_sqlhierarchical.php" name="migration/16_kronolith_upgrade_sqlhierarchical.php" />
+   <install as="kronolith/migration/17_kronolith_upgrade_sqlnghierarchical.php" name="migration/17_kronolith_upgrade_sqlnghierarchical.php" />
    <install as="packaging/redhat/kronolith.conf" name="packaging/redhat/kronolith.conf" />
    <install as="packaging/redhat/kronolith.README" name="packaging/redhat/kronolith.README" />
    <install as="packaging/redhat/kronolith.spec" name="packaging/redhat/kronolith.spec" />
@@ -1351,7 +1349,7 @@
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2011-01-25</date>
+   <date>2011-01-27</date>
    <license uri="http://www.gnu.org/licenses/gpl.html">GPL</license>
    <notes>
 * Initial release.
diff --git a/turba/package.xml b/turba/package.xml
index f5093801b..b878d917f 100644
--- a/turba/package.xml
+++ b/turba/package.xml
@@ -16,8 +16,8 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2011-01-25</date>
- <time>10:00:23</time>
+ <date>2011-01-27</date>
+ <time>17:28:51</time>
  <version>
   <release>3.0.0</release>
   <api>3.0.0</api>
@@ -33,520 +33,524 @@
  <contents>
   <dir baseinstalldir="/" name="/">
    <dir name="addressbooks">
-    <file baseinstalldir="/" name="create.php" role="horde" />
-    <file baseinstalldir="/" name="delete.php" role="horde" />
-    <file baseinstalldir="/" name="edit.php" role="horde" />
-    <file baseinstalldir="/" name="index.php" role="horde" />
+    <file name="create.php" role="horde" />
+    <file name="delete.php" role="horde" />
+    <file name="edit.php" role="horde" />
+    <file name="index.php" role="horde" />
    </dir> <!-- /addressbooks -->
    <dir name="config">
-    <file baseinstalldir="/" name="attributes.php.dist" role="horde" />
-    <file baseinstalldir="/" name="backends.php.dist" role="horde" />
-    <file baseinstalldir="/" name="conf.xml" role="horde" />
-    <file baseinstalldir="/" name="hooks.php.dist" role="horde" />
-    <file baseinstalldir="/" name="menu.php.dist" role="horde" />
-    <file baseinstalldir="/" name="mime_drivers.php.dist" role="horde" />
-    <file baseinstalldir="/" name="prefs.php.dist" role="horde" />
+    <file name="attributes.php.dist" role="horde" />
+    <file name="backends.php.dist" role="horde" />
+    <file name="conf.xml" role="horde" />
+    <file name="hooks.php.dist" role="horde" />
+    <file name="menu.php.dist" role="horde" />
+    <file name="mime_drivers.php.dist" role="horde" />
+    <file name="prefs.php.dist" role="horde" />
    </dir> <!-- /config -->
    <dir name="docs">
     <dir name="vcf">
-     <file baseinstalldir="/" name="brad.vcf" role="doc" />
-     <file baseinstalldir="/" name="dimitris.vcf" role="doc" />
-     <file baseinstalldir="/" name="dwalt.vcf" role="doc" />
-     <file baseinstalldir="/" name="foo.vcf" role="doc" />
-     <file baseinstalldir="/" name="larry.vcf" role="doc" />
-     <file baseinstalldir="/" name="multiple.vcf" role="doc" />
-     <file baseinstalldir="/" name="palm.vcf" role="doc" />
-     <file baseinstalldir="/" name="README" role="doc" />
-     <file baseinstalldir="/" name="sfg.vcf" role="doc" />
-     <file baseinstalldir="/" name="test.vcf" role="doc" />
+     <file name="brad.vcf" role="doc" />
+     <file name="dimitris.vcf" role="doc" />
+     <file name="dwalt.vcf" role="doc" />
+     <file name="foo.vcf" role="doc" />
+     <file name="larry.vcf" role="doc" />
+     <file name="multiple.vcf" role="doc" />
+     <file name="palm.vcf" role="doc" />
+     <file name="README" role="doc" />
+     <file name="sfg.vcf" role="doc" />
+     <file name="test.vcf" role="doc" />
     </dir> <!-- /docs/vcf -->
-    <file baseinstalldir="/" name="CHANGES" role="doc" />
-    <file baseinstalldir="/" name="CREDITS" role="doc" />
-    <file baseinstalldir="/" name="INSTALL" role="doc" />
-    <file baseinstalldir="/" name="LDAP" role="doc" />
-    <file baseinstalldir="/" name="RELEASE_NOTES" role="doc" />
-    <file baseinstalldir="/" name="UPGRADING" role="doc" />
+    <file name="CHANGES" role="doc" />
+    <file name="CREDITS" role="doc" />
+    <file name="INSTALL" role="doc" />
+    <file name="LDAP" role="doc" />
+    <file name="RELEASE_NOTES" role="doc" />
+    <file name="UPGRADING" role="doc" />
    </dir> <!-- /docs -->
    <dir name="js">
-    <file baseinstalldir="/" name="browse.js" role="horde" />
-    <file baseinstalldir="/" name="columnprefs.js" role="horde" />
-    <file baseinstalldir="/" name="contact_tabs.js" role="horde" />
-    <file baseinstalldir="/" name="search.js" role="horde" />
+    <file name="browse.js" role="horde" />
+    <file name="columnprefs.js" role="horde" />
+    <file name="contact_tabs.js" role="horde" />
+    <file name="search.js" role="horde" />
    </dir> <!-- /js -->
    <dir name="lib">
     <dir name="Block">
-     <file baseinstalldir="/" name="minisearch.php" role="horde" />
+     <file name="minisearch.php" role="horde" />
     </dir> <!-- /lib/Block -->
     <dir name="Data">
-     <file baseinstalldir="/" name="Ldif.php" role="horde" />
+     <file name="Ldif.php" role="horde" />
     </dir> <!-- /lib/Data -->
     <dir name="Driver">
      <dir name="Kolab">
       <dir name="Wrapper">
-       <file baseinstalldir="/" name="New.php" role="horde" />
-       <file baseinstalldir="/" name="Old.php" role="horde" />
+       <file name="New.php" role="horde" />
+       <file name="Old.php" role="horde" />
       </dir> <!-- /lib/Driver/Kolab/Wrapper -->
-      <file baseinstalldir="/" name="Wrapper.php" role="horde" />
+      <file name="Wrapper.php" role="horde" />
      </dir> <!-- /lib/Driver/Kolab -->
-     <file baseinstalldir="/" name="Facebook.php" role="horde" />
-     <file baseinstalldir="/" name="Favourites.php" role="horde" />
-     <file baseinstalldir="/" name="Group.php" role="horde" />
-     <file baseinstalldir="/" name="Imsp.php" role="horde" />
-     <file baseinstalldir="/" name="Kolab.php" role="horde" />
-     <file baseinstalldir="/" name="Ldap.php" role="horde" />
-     <file baseinstalldir="/" name="Prefs.php" role="horde" />
-     <file baseinstalldir="/" name="Share.php" role="horde" />
-     <file baseinstalldir="/" name="Sql.php" role="horde" />
-     <file baseinstalldir="/" name="Vbook.php" role="horde" />
+     <file name="Facebook.php" role="horde" />
+     <file name="Favourites.php" role="horde" />
+     <file name="Group.php" role="horde" />
+     <file name="Imsp.php" role="horde" />
+     <file name="Kolab.php" role="horde" />
+     <file name="Ldap.php" role="horde" />
+     <file name="Prefs.php" role="horde" />
+     <file name="Share.php" role="horde" />
+     <file name="Sql.php" role="horde" />
+     <file name="Vbook.php" role="horde" />
     </dir> <!-- /lib/Driver -->
+    <dir name="Factory">
+     <file name="Driver.php" role="horde" />
+    </dir> <!-- /lib/Factory -->
     <dir name="Form">
-     <file baseinstalldir="/" name="AddContact.php" role="horde" />
-     <file baseinstalldir="/" name="Contact.php" role="horde" />
-     <file baseinstalldir="/" name="CreateAddressBook.php" role="horde" />
-     <file baseinstalldir="/" name="DeleteAddressBook.php" role="horde" />
-     <file baseinstalldir="/" name="EditAddressBook.php" role="horde" />
-     <file baseinstalldir="/" name="EditContact.php" role="horde" />
-     <file baseinstalldir="/" name="EditContactGroup.php" role="horde" />
+     <file name="AddContact.php" role="horde" />
+     <file name="Contact.php" role="horde" />
+     <file name="CreateAddressBook.php" role="horde" />
+     <file name="DeleteAddressBook.php" role="horde" />
+     <file name="EditAddressBook.php" role="horde" />
+     <file name="EditContact.php" role="horde" />
+     <file name="EditContactGroup.php" role="horde" />
     </dir> <!-- /lib/Form -->
-    <dir name="Injector">
-     <dir name="Factory">
-      <file baseinstalldir="/" name="Driver.php" role="horde" />
-     </dir> <!-- /lib/Injector/Factory -->
-    </dir> <!-- /lib/Injector -->
     <dir name="LoginTasks">
      <dir name="SystemTask">
-      <file baseinstalldir="/" name="UpgradeFromTurba2.php" role="horde" />
-      <file baseinstalldir="/" name="UpgradeLists.php" role="horde" />
-      <file baseinstalldir="/" name="UpgradePrefs.php" role="horde" />
+      <file name="UpgradeFromTurba2.php" role="horde" />
+      <file name="UpgradeLists.php" role="horde" />
+      <file name="UpgradePrefs.php" role="horde" />
      </dir> <!-- /lib/LoginTasks/SystemTask -->
     </dir> <!-- /lib/LoginTasks -->
     <dir name="Object">
-     <file baseinstalldir="/" name="Group.php" role="horde" />
+     <file name="Group.php" role="horde" />
     </dir> <!-- /lib/Object -->
     <dir name="tests">
-     <file baseinstalldir="/" name="ApiTest.php" role="horde" />
-     <file baseinstalldir="/" name="az.png" role="data" />
-     <file baseinstalldir="/" name="BrowsePageTest.php" role="horde" />
-     <file baseinstalldir="/" name="bug_6518.phpt" role="data" />
-     <file baseinstalldir="/" name="DriverTest.php" role="horde" />
-     <file baseinstalldir="/" name="GroupTest.php" role="horde" />
-     <file baseinstalldir="/" name="import.ldif" role="data" />
-     <file baseinstalldir="/" name="importCRLF.ldif" role="data" />
-     <file baseinstalldir="/" name="KolabTest.php" role="horde" />
-     <file baseinstalldir="/" name="KolabTestBase.php" role="horde" />
-     <file baseinstalldir="/" name="ldif_exportFile.phpt" role="data" />
-     <file baseinstalldir="/" name="ldif_importFile.phpt" role="data" />
-     <file baseinstalldir="/" name="ldif_importFileCRLF.phpt" role="data" />
-     <file baseinstalldir="/" name="ListTest.php" role="horde" />
-     <file baseinstalldir="/" name="ListViewTest.php" role="horde" />
-     <file baseinstalldir="/" name="TestBase.php" role="horde" />
-     <file baseinstalldir="/" name="tohash.phpt" role="data" />
-     <file baseinstalldir="/" name="tovcard.phpt" role="data" />
-     <file baseinstalldir="/" name="ViewBrowseTest.php" role="horde" />
-     <file baseinstalldir="/" name="ViewListTest.php" role="horde" />
+     <file name="ApiTest.php" role="horde" />
+     <file name="az.png" role="data" />
+     <file name="BrowsePageTest.php" role="horde" />
+     <file name="bug_6518.phpt" role="data" />
+     <file name="DriverTest.php" role="horde" />
+     <file name="GroupTest.php" role="horde" />
+     <file name="import.ldif" role="data" />
+     <file name="importCRLF.ldif" role="data" />
+     <file name="KolabTest.php" role="horde" />
+     <file name="KolabTestBase.php" role="horde" />
+     <file name="ldif_exportFile.phpt" role="data" />
+     <file name="ldif_importFile.phpt" role="data" />
+     <file name="ldif_importFileCRLF.phpt" role="data" />
+     <file name="ListTest.php" role="horde" />
+     <file name="ListViewTest.php" role="horde" />
+     <file name="TestBase.php" role="horde" />
+     <file name="tohash.phpt" role="data" />
+     <file name="tovcard.phpt" role="data" />
+     <file name="ViewBrowseTest.php" role="horde" />
+     <file name="ViewListTest.php" role="horde" />
     </dir> <!-- /lib/tests -->
     <dir name="View">
-     <file baseinstalldir="/" name="Browse.php" role="horde" />
-     <file baseinstalldir="/" name="Contact.php" role="horde" />
-     <file baseinstalldir="/" name="DeleteContact.php" role="horde" />
-     <file baseinstalldir="/" name="Duplicates.php" role="horde" />
-     <file baseinstalldir="/" name="EditContact.php" role="horde" />
-     <file baseinstalldir="/" name="List.php" role="horde" />
+     <dir name="List">
+      <file name="AlphaFilter.php" role="horde" />
+      <file name="PageFilter.php" role="horde" />
+     </dir> <!-- /lib/View/List -->
+     <file name="Browse.php" role="horde" />
+     <file name="Contact.php" role="horde" />
+     <file name="DeleteContact.php" role="horde" />
+     <file name="Duplicates.php" role="horde" />
+     <file name="EditContact.php" role="horde" />
+     <file name="List.php" role="horde" />
     </dir> <!-- /lib/View -->
-    <file baseinstalldir="/" name="Api.php" role="horde" />
-    <file baseinstalldir="/" name="Application.php" role="horde" />
-    <file baseinstalldir="/" name="Driver.php" role="horde" />
-    <file baseinstalldir="/" name="Exception.php" role="horde" />
-    <file baseinstalldir="/" name="List.php" role="horde" />
-    <file baseinstalldir="/" name="Object.php" role="horde" />
-    <file baseinstalldir="/" name="Test.php" role="horde" />
-    <file baseinstalldir="/" name="Turba.php" role="horde" />
+    <file name="Api.php" role="horde" />
+    <file name="Application.php" role="horde" />
+    <file name="Driver.php" role="horde" />
+    <file name="Exception.php" role="horde" />
+    <file name="List.php" role="horde" />
+    <file name="Object.php" role="horde" />
+    <file name="Test.php" role="horde" />
+    <file name="Turba.php" role="horde" />
    </dir> <!-- /lib -->
    <dir name="locale">
     <dir name="ar">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/ar/LC_MESSAGES -->
     </dir> <!-- /locale/ar -->
     <dir name="bg">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/bg/LC_MESSAGES -->
     </dir> <!-- /locale/bg -->
     <dir name="ca">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/ca/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/ca -->
     <dir name="cs">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/cs/LC_MESSAGES -->
     </dir> <!-- /locale/cs -->
     <dir name="da">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/da/LC_MESSAGES -->
     </dir> <!-- /locale/da -->
     <dir name="de">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/de/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/de -->
     <dir name="el">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/el/LC_MESSAGES -->
     </dir> <!-- /locale/el -->
     <dir name="en">
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/en -->
     <dir name="es">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/es/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/es -->
     <dir name="et">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/et/LC_MESSAGES -->
     </dir> <!-- /locale/et -->
     <dir name="eu">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/eu/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/eu -->
     <dir name="fa">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/fa/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/fa -->
     <dir name="fi">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/fi/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/fi -->
     <dir name="fr">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/fr/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/fr -->
     <dir name="gl">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/gl/LC_MESSAGES -->
     </dir> <!-- /locale/gl -->
     <dir name="hr">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/hr/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/hr -->
     <dir name="hu">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/hu/LC_MESSAGES -->
     </dir> <!-- /locale/hu -->
     <dir name="is">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/is/LC_MESSAGES -->
     </dir> <!-- /locale/is -->
     <dir name="it">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/it/LC_MESSAGES -->
     </dir> <!-- /locale/it -->
     <dir name="ja">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/ja/LC_MESSAGES -->
     </dir> <!-- /locale/ja -->
     <dir name="ko">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/ko/LC_MESSAGES -->
     </dir> <!-- /locale/ko -->
     <dir name="lt">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/lt/LC_MESSAGES -->
     </dir> <!-- /locale/lt -->
     <dir name="lv">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/lv/LC_MESSAGES -->
     </dir> <!-- /locale/lv -->
     <dir name="mk">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/mk/LC_MESSAGES -->
     </dir> <!-- /locale/mk -->
     <dir name="nb">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/nb/LC_MESSAGES -->
     </dir> <!-- /locale/nb -->
     <dir name="nl">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/nl/LC_MESSAGES -->
     </dir> <!-- /locale/nl -->
     <dir name="nn">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/nn/LC_MESSAGES -->
     </dir> <!-- /locale/nn -->
     <dir name="pl">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/pl/LC_MESSAGES -->
     </dir> <!-- /locale/pl -->
     <dir name="pt">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/pt/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/pt -->
     <dir name="pt_BR">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/pt_BR/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/pt_BR -->
     <dir name="ro">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/ro/LC_MESSAGES -->
     </dir> <!-- /locale/ro -->
     <dir name="ru">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/ru/LC_MESSAGES -->
     </dir> <!-- /locale/ru -->
     <dir name="sk">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/sk/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/sk -->
     <dir name="sl">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/sl/LC_MESSAGES -->
     </dir> <!-- /locale/sl -->
     <dir name="sv">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/sv/LC_MESSAGES -->
     </dir> <!-- /locale/sv -->
     <dir name="tr">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/tr/LC_MESSAGES -->
-     <file baseinstalldir="/" name="help.xml" role="horde" />
+     <file name="help.xml" role="horde" />
     </dir> <!-- /locale/tr -->
     <dir name="uk">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/uk/LC_MESSAGES -->
     </dir> <!-- /locale/uk -->
     <dir name="zh_CN">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/zh_CN/LC_MESSAGES -->
     </dir> <!-- /locale/zh_CN -->
     <dir name="zh_TW">
      <dir name="LC_MESSAGES">
-      <file baseinstalldir="/" name="turba.mo" role="horde" />
-      <file baseinstalldir="/" name="turba.po" role="horde" />
+      <file name="turba.mo" role="horde" />
+      <file name="turba.po" role="horde" />
      </dir> <!-- /locale/zh_TW/LC_MESSAGES -->
     </dir> <!-- /locale/zh_TW -->
-    <file baseinstalldir="/" name="turba.pot" role="horde" />
+    <file name="turba.pot" role="horde" />
    </dir> <!-- /locale -->
    <dir name="migration">
-    <file baseinstalldir="/" name="1_turba_base_tables.php" role="horde" />
-    <file baseinstalldir="/" name="2_turba_upgrade_autoincrement.php" role="horde" />
-    <file baseinstalldir="/" name="3_turba_upgrade_sqlng.php" role="horde" />
+    <file name="1_turba_base_tables.php" role="horde" />
+    <file name="2_turba_upgrade_autoincrement.php" role="horde" />
+    <file name="3_turba_upgrade_sqlng.php" role="horde" />
+    <file name="4_turba_upgrade_sqlhierarchical.php" role="horde" />
+    <file name="5_turba_upgrade_sqlnghierarchical.php" role="horde" />
    </dir> <!-- /migration -->
    <dir name="scripts">
     <dir name="ldap">
-     <file baseinstalldir="/" name="addou" role="data" />
-     <file baseinstalldir="/" name="addou.pl" role="data" />
+     <file name="addou" role="data" />
+     <file name="addou.pl" role="data" />
     </dir> <!-- /scripts/ldap -->
     <dir name="upgrades">
-     <file baseinstalldir="/" name="convert_datatree_shares_to_sql.php" role="data" />
-     <file baseinstalldir="/" name="convert_sql_shares_to_sqlng.php" role="data" />
-     <file baseinstalldir="/" name="public_to_horde_share.php" role="data" />
+     <file name="convert_datatree_shares_to_sql.php" role="data" />
+     <file name="convert_sql_shares_to_sqlng.php" role="data" />
+     <file name="public_to_horde_share.php" role="data" />
     </dir> <!-- /scripts/upgrades -->
-    <file baseinstalldir="/" name="import_squirrelmail_file_abook.php" role="data" />
-    <file baseinstalldir="/" name="import_squirrelmail_sql_abook.php" role="data" />
-    <file baseinstalldir="/" name="import_vcards.php" role="data" />
-    <file baseinstalldir="/" name="Turba.reg" role="data" />
+    <file name="import_squirrelmail_file_abook.php" role="data" />
+    <file name="import_squirrelmail_sql_abook.php" role="data" />
+    <file name="import_vcards.php" role="data" />
+    <file name="Turba.reg" role="data" />
    </dir> <!-- /scripts -->
    <dir name="templates">
     <dir name="block">
-     <file baseinstalldir="/" name="minisearch.inc" role="horde" />
+     <file name="minisearch.inc" role="horde" />
     </dir> <!-- /templates/block -->
     <dir name="browse">
-     <file baseinstalldir="/" name="actions.inc" role="horde" />
-     <file baseinstalldir="/" name="column_footers.inc" role="horde" />
-     <file baseinstalldir="/" name="column_headers.inc" role="horde" />
-     <file baseinstalldir="/" name="header.inc" role="horde" />
-     <file baseinstalldir="/" name="row.inc" role="horde" />
+     <file name="actions.inc" role="horde" />
+     <file name="column_footers.inc" role="horde" />
+     <file name="column_headers.inc" role="horde" />
+     <file name="header.inc" role="horde" />
+     <file name="row.inc" role="horde" />
     </dir> <!-- /templates/browse -->
     <dir name="data">
-     <file baseinstalldir="/" name="export.inc" role="horde" />
-     <file baseinstalldir="/" name="import.inc" role="horde" />
+     <file name="export.inc" role="horde" />
+     <file name="import.inc" role="horde" />
     </dir> <!-- /templates/data -->
     <dir name="list">
-     <file baseinstalldir="/" name="alphaPager.inc" role="horde" />
-     <file baseinstalldir="/" name="numPager.inc" role="horde" />
+     <file name="alphaPager.inc" role="horde" />
+     <file name="numPager.inc" role="horde" />
     </dir> <!-- /templates/list -->
     <dir name="prefs">
-     <file baseinstalldir="/" name="column.html" role="horde" />
+     <file name="column.html" role="horde" />
     </dir> <!-- /templates/prefs -->
     <dir name="search">
      <dir name="duplicate">
-      <file baseinstalldir="/" name="contact_footer.html.php" role="horde" />
-      <file baseinstalldir="/" name="contact_header.html.php" role="horde" />
-      <file baseinstalldir="/" name="footer.html.php" role="horde" />
-      <file baseinstalldir="/" name="header.html.php" role="horde" />
-      <file baseinstalldir="/" name="list.html.php" role="horde" />
+      <file name="contact_footer.html.php" role="horde" />
+      <file name="contact_header.html.php" role="horde" />
+      <file name="footer.html.php" role="horde" />
+      <file name="header.html.php" role="horde" />
+      <file name="list.html.php" role="horde" />
      </dir> <!-- /templates/search/duplicate -->
-     <file baseinstalldir="/" name="advanced.html.php" role="horde" />
-     <file baseinstalldir="/" name="basic.html.php" role="horde" />
-     <file baseinstalldir="/" name="duplicate.html.php" role="horde" />
-     <file baseinstalldir="/" name="header.html.php" role="horde" />
-     <file baseinstalldir="/" name="vbook.html.php" role="horde" />
+     <file name="advanced.html.php" role="horde" />
+     <file name="basic.html.php" role="horde" />
+     <file name="duplicate.html.php" role="horde" />
+     <file name="header.html.php" role="horde" />
+     <file name="vbook.html.php" role="horde" />
     </dir> <!-- /templates/search -->
     <dir name="test">
-     <file baseinstalldir="/" name="ldapserver.inc" role="horde" />
+     <file name="ldapserver.inc" role="horde" />
     </dir> <!-- /templates/test -->
-    <file baseinstalldir="/" name="addressbook_list.php" role="horde" />
-    <file baseinstalldir="/" name="menu.inc" role="horde" />
+    <file name="addressbook_list.php" role="horde" />
+    <file name="menu.inc" role="horde" />
    </dir> <!-- /templates -->
    <dir name="themes">
     <dir name="bluewhite">
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/bluewhite -->
     <dir name="default">
      <dir name="graphics">
       <dir name="menu">
-       <file baseinstalldir="/" name="browse.png" role="horde" />
-       <file baseinstalldir="/" name="new.png" role="horde" />
+       <file name="browse.png" role="horde" />
+       <file name="new.png" role="horde" />
       </dir> <!-- /themes/default/graphics/menu -->
-      <file baseinstalldir="/" name="az.png" role="horde" />
-      <file baseinstalldir="/" name="az_secondary.png" role="horde" />
-      <file baseinstalldir="/" name="contact.png" role="horde" />
-      <file baseinstalldir="/" name="favicon.ico" role="horde" />
-      <file baseinstalldir="/" name="group.png" role="horde" />
-      <file baseinstalldir="/" name="new.png" role="horde" />
-      <file baseinstalldir="/" name="search.png" role="horde" />
-      <file baseinstalldir="/" name="turba.png" role="horde" />
-      <file baseinstalldir="/" name="za.png" role="horde" />
-      <file baseinstalldir="/" name="za_secondary.png" role="horde" />
+      <file name="az.png" role="horde" />
+      <file name="az_secondary.png" role="horde" />
+      <file name="contact.png" role="horde" />
+      <file name="favicon.ico" role="horde" />
+      <file name="group.png" role="horde" />
+      <file name="new.png" role="horde" />
+      <file name="search.png" role="horde" />
+      <file name="turba.png" role="horde" />
+      <file name="za.png" role="horde" />
+      <file name="za_secondary.png" role="horde" />
      </dir> <!-- /themes/default/graphics -->
-     <file baseinstalldir="/" name="ie6_or_less.css" role="horde" />
-     <file baseinstalldir="/" name="ie7.css" role="horde" />
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="ie6_or_less.css" role="horde" />
+     <file name="ie7.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/default -->
     <dir name="ideas">
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/ideas -->
     <dir name="silver">
      <dir name="graphics">
       <dir name="menu">
-       <file baseinstalldir="/" name="browse.png" role="horde" />
-       <file baseinstalldir="/" name="new.png" role="horde" />
+       <file name="browse.png" role="horde" />
+       <file name="new.png" role="horde" />
       </dir> <!-- /themes/silver/graphics/menu -->
-      <file baseinstalldir="/" name="az.png" role="horde" />
-      <file baseinstalldir="/" name="az_secondary.png" role="horde" />
-      <file baseinstalldir="/" name="contact.png" role="horde" />
-      <file baseinstalldir="/" name="favicon.ico" role="horde" />
-      <file baseinstalldir="/" name="group.png" role="horde" />
-      <file baseinstalldir="/" name="new.png" role="horde" />
-      <file baseinstalldir="/" name="turba.png" role="horde" />
-      <file baseinstalldir="/" name="za.png" role="horde" />
-      <file baseinstalldir="/" name="za_secondary.png" role="horde" />
+      <file name="az.png" role="horde" />
+      <file name="az_secondary.png" role="horde" />
+      <file name="contact.png" role="horde" />
+      <file name="favicon.ico" role="horde" />
+      <file name="group.png" role="horde" />
+      <file name="new.png" role="horde" />
+      <file name="turba.png" role="horde" />
+      <file name="za.png" role="horde" />
+      <file name="za_secondary.png" role="horde" />
      </dir> <!-- /themes/silver/graphics -->
-     <file baseinstalldir="/" name="screen.css" role="horde" />
+     <file name="screen.css" role="horde" />
     </dir> <!-- /themes/silver -->
     <dir name="tango-blue">
      <dir name="graphics">
       <dir name="menu">
-       <file baseinstalldir="/" name="browse.png" role="horde" />
-       <file baseinstalldir="/" name="new.png" role="horde" />
+       <file name="browse.png" role="horde" />
+       <file name="new.png" role="horde" />
       </dir> <!-- /themes/tango-blue/graphics/menu -->
-      <file baseinstalldir="/" name="az_secondary.png" role="horde" />
-      <file baseinstalldir="/" name="contact.png" role="horde" />
-      <file baseinstalldir="/" name="favicon.ico" role="horde" />
-      <file baseinstalldir="/" name="group.png" role="horde" />
-      <file baseinstalldir="/" name="new.png" role="horde" />
-      <file baseinstalldir="/" name="turba.png" role="horde" />
-      <file baseinstalldir="/" name="za_secondary.png" role="horde" />
+      <file name="az_secondary.png" role="horde" />
+      <file name="contact.png" role="horde" />
+      <file name="favicon.ico" role="horde" />
+      <file name="group.png" role="horde" />
+      <file name="new.png" role="horde" />
+      <file name="turba.png" role="horde" />
+      <file name="za_secondary.png" role="horde" />
      </dir> <!-- /themes/tango-blue/graphics -->
     </dir> <!-- /themes/tango-blue -->
    </dir> <!-- /themes -->
-   <file baseinstalldir="/" name="add.php" role="horde" />
-   <file baseinstalldir="/" name="browse.php" role="horde" />
-   <file baseinstalldir="/" name="contact.php" role="horde" />
-   <file baseinstalldir="/" name="data.php" role="horde" />
-   <file baseinstalldir="/" name="delete.php" role="horde" />
-   <file baseinstalldir="/" name="deletefile.php" role="horde" />
-   <file baseinstalldir="/" name="edit.php" role="horde" />
-   <file baseinstalldir="/" name="index.php" role="horde" />
-   <file baseinstalldir="/" name="LICENSE" role="data" />
-   <file baseinstalldir="/" name="merge.php" role="horde" />
-   <file baseinstalldir="/" name="minisearch.php" role="horde" />
-   <file baseinstalldir="/" name="README" role="data" />
-   <file baseinstalldir="/" name="search.php" role="horde" />
-   <file baseinstalldir="/" name="vcard.php" role="horde" />
-   <file baseinstalldir="/" name="view.php" role="horde" />
+   <file name="add.php" role="horde" />
+   <file name="browse.php" role="horde" />
+   <file name="contact.php" role="horde" />
+   <file name="data.php" role="horde" />
+   <file name="delete.php" role="horde" />
+   <file name="deletefile.php" role="horde" />
+   <file name="edit.php" role="horde" />
+   <file name="index.php" role="horde" />
+   <file name="LICENSE" role="data" />
+   <file name="merge.php" role="horde" />
+   <file name="minisearch.php" role="horde" />
+   <file name="README" role="data" />
+   <file name="search.php" role="horde" />
+   <file name="vcard.php" role="horde" />
+   <file name="view.php" role="horde" />
   </dir> <!-- / -->
  </contents>
  <dependencies>
@@ -624,6 +628,7 @@
    <install as="turba/lib/Driver/Kolab/Wrapper.php" name="lib/Driver/Kolab/Wrapper.php" />
    <install as="turba/lib/Driver/Kolab/Wrapper/New.php" name="lib/Driver/Kolab/Wrapper/New.php" />
    <install as="turba/lib/Driver/Kolab/Wrapper/Old.php" name="lib/Driver/Kolab/Wrapper/Old.php" />
+   <install as="turba/lib/Factory/Driver.php" name="lib/Factory/Driver.php" />
    <install as="turba/lib/Form/AddContact.php" name="lib/Form/AddContact.php" />
    <install as="turba/lib/Form/Contact.php" name="lib/Form/Contact.php" />
    <install as="turba/lib/Form/CreateAddressBook.php" name="lib/Form/CreateAddressBook.php" />
@@ -631,7 +636,6 @@
    <install as="turba/lib/Form/EditAddressBook.php" name="lib/Form/EditAddressBook.php" />
    <install as="turba/lib/Form/EditContact.php" name="lib/Form/EditContact.php" />
    <install as="turba/lib/Form/EditContactGroup.php" name="lib/Form/EditContactGroup.php" />
-   <install as="turba/lib/Injector/Factory/Driver.php" name="lib/Injector/Factory/Driver.php" />
    <install as="turba/lib/LoginTasks/SystemTask/UpgradeFromTurba2.php" name="lib/LoginTasks/SystemTask/UpgradeFromTurba2.php" />
    <install as="turba/lib/LoginTasks/SystemTask/UpgradeLists.php" name="lib/LoginTasks/SystemTask/UpgradeLists.php" />
    <install as="turba/lib/LoginTasks/SystemTask/UpgradePrefs.php" name="lib/LoginTasks/SystemTask/UpgradePrefs.php" />
@@ -662,6 +666,8 @@
    <install as="turba/lib/View/Duplicates.php" name="lib/View/Duplicates.php" />
    <install as="turba/lib/View/EditContact.php" name="lib/View/EditContact.php" />
    <install as="turba/lib/View/List.php" name="lib/View/List.php" />
+   <install as="turba/lib/View/List/AlphaFilter.php" name="lib/View/List/AlphaFilter.php" />
+   <install as="turba/lib/View/List/PageFilter.php" name="lib/View/List/PageFilter.php" />
    <install as="turba/locale/turba.pot" name="locale/turba.pot" />
    <install as="turba/locale/ar/LC_MESSAGES/turba.mo" name="locale/ar/LC_MESSAGES/turba.mo" />
    <install as="turba/locale/ar/LC_MESSAGES/turba.po" name="locale/ar/LC_MESSAGES/turba.po" />
@@ -755,6 +761,8 @@
    <install as="turba/migration/1_turba_base_tables.php" name="migration/1_turba_base_tables.php" />
    <install as="turba/migration/2_turba_upgrade_autoincrement.php" name="migration/2_turba_upgrade_autoincrement.php" />
    <install as="turba/migration/3_turba_upgrade_sqlng.php" name="migration/3_turba_upgrade_sqlng.php" />
+   <install as="turba/migration/4_turba_upgrade_sqlhierarchical.php" name="migration/4_turba_upgrade_sqlhierarchical.php" />
+   <install as="turba/migration/5_turba_upgrade_sqlnghierarchical.php" name="migration/5_turba_upgrade_sqlnghierarchical.php" />
    <install as="scripts/import_squirrelmail_file_abook.php" name="scripts/import_squirrelmail_file_abook.php" />
    <install as="scripts/import_squirrelmail_sql_abook.php" name="scripts/import_squirrelmail_sql_abook.php" />
    <install as="scripts/import_vcards.php" name="scripts/import_vcards.php" />
@@ -853,7 +861,7 @@
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2011-01-25</date>
+   <date>2011-01-27</date>
    <license uri="http://opensource.org/licenses/bsd-license.php">BSD</license>
    <notes>
 * Initial release.
-- 
2.11.0