Merge

diff --cc po/virt-mem.pot
index 11657fa,67178a0..3f01df4
--- 1/po/virt-mem.pot
--- 2/po/virt-mem.pot
+++ b/po/virt-mem.pot
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-08-07 10:55+0000\n"
 -"POT-Creation-Date: 2008-06-10 16:27+0000\n"
++"POT-Creation-Date: 2008-08-07 10:58+0000\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"