svn merge ^/trunk/phpgwapi@27377 ^/branches/SyncML-1.2/phpgwapi .
many thanks to the horde project for writing very good code!!