Merge remote branch 'origin/master' into dracut

Conflicts:
	lfs/dracut
This commit is contained in:
Michael Tremer
2010-07-25 22:48:28 +02:00
13 changed files with 266 additions and 34 deletions

View File

@@ -1,14 +1,19 @@
bin/cpio
bin/mt
#usr/info/cpio.info
#usr/man/man1/cpio.1
#usr/man/man1/mt.1
#usr/share/info/cpio.info
#usr/share/locale/da/LC_MESSAGES/cpio.mo
#usr/share/locale/de/LC_MESSAGES/cpio.mo
#usr/share/locale/es/LC_MESSAGES/cpio.mo
#usr/share/locale/fi/LC_MESSAGES/cpio.mo
#usr/share/locale/fr/LC_MESSAGES/cpio.mo
#usr/share/locale/ga
#usr/share/locale/ga/LC_MESSAGES
#usr/share/locale/ga/LC_MESSAGES/cpio.mo
#usr/share/locale/gl/LC_MESSAGES/cpio.mo
#usr/share/locale/hu/LC_MESSAGES/cpio.mo
#usr/share/locale/id
#usr/share/locale/id/LC_MESSAGES
#usr/share/locale/id/LC_MESSAGES/cpio.mo
#usr/share/locale/ko/LC_MESSAGES/cpio.mo
#usr/share/locale/nl/LC_MESSAGES/cpio.mo
#usr/share/locale/pl/LC_MESSAGES/cpio.mo
@@ -17,4 +22,11 @@ bin/mt
#usr/share/locale/ru/LC_MESSAGES/cpio.mo
#usr/share/locale/sv/LC_MESSAGES/cpio.mo
#usr/share/locale/tr/LC_MESSAGES/cpio.mo
#usr/share/locale/uk/LC_MESSAGES/cpio.mo
#usr/share/locale/vi
#usr/share/locale/vi/LC_MESSAGES
#usr/share/locale/vi/LC_MESSAGES/cpio.mo
#usr/share/locale/zh_CN/LC_MESSAGES/cpio.mo
#usr/share/locale/zh_TW/LC_MESSAGES/cpio.mo
#usr/share/man/man1/cpio.1
#usr/share/man/man1/mt.1