# HG changeset patch # User Pat Downey # Date 1277309106 -3600 # Node ID 29d7e0a3b7b2ae70733ee09a8ab55dc3dbd48960 # Parent 03646e8da489d883fdcb5d0acc8b159663ba3ba5# Parent 11a8fa9275d5ae6bc8a342981ed232c586ed7a77 Merge heads. diff -r 03646e8da489 -r 29d7e0a3b7b2 homescreenapp/stateplugins/hsapplibrarystateplugin/resource/applibrary.docml diff -r 03646e8da489 -r 29d7e0a3b7b2 homescreenapp/stateplugins/hsmenuworkerstateplugin/resource/hsarrangedialog.docml