Merge branch 'maint'

Conflicts due to change in return calling style.

Conflicts:
	src/pacman/pacman.c
	src/pacman/sync.c

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index ba88318b..b4a5da66 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pacman 3.5.0\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-03-16 19:34-0500\n"
+"POT-Creation-Date: 2011-03-20 12:35-0500\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"
@@ -188,7 +188,11 @@ msgid "could not determine mount point for file %s\n"
 msgstr ""
 
 #, c-format
-msgid "could not determine filesystem mount points"
+msgid "could not determine filesystem mount points\n"
+msgstr ""
+
+#, c-format
+msgid "could not determine root mount point %s\n"
 msgstr ""
 
 #, c-format