merge of 56993761cfcc246959dccb5e35fa402c5c3c9738

author Rod Whitby <rod@whitby.id.au>

Wed, 8 Feb 2006 11:54:37 +0000 (11:54 +0000)

committer OpenEmbedded Project <openembedded-devel@lists.openembedded.org>

Wed, 8 Feb 2006 11:54:37 +0000 (11:54 +0000)
author Rod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 11:54:37 +0000 (11:54 +0000)
committer OpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 11:54:37 +0000 (11:54 +0000)
diff --cc packages/initscripts/initscripts-1.0/slugos/checkroot.sh
Simple merge
diff --cc packages/lirc/lirc-modules_0.8.0.bb
Simple merge
diff --cc packages/meta/slugos-packages.bb
Simple merge
author	Rod Whitby <rod@whitby.id.au>
	Wed, 8 Feb 2006 11:54:37 +0000 (11:54 +0000)
committer	OpenEmbedded Project <openembedded-devel@lists.openembedded.org>
	Wed, 8 Feb 2006 11:54:37 +0000 (11:54 +0000)
		1	2
packages/initscripts/initscripts-1.0/slugos/checkroot.sh	patch \|	diff1 \|	diff2 \|	blob \| history
packages/lirc/lirc-modules_0.8.0.bb	patch \|	diff1 \|	diff2 \|	blob \| history
packages/meta/slugos-packages.bb	patch \|	diff1 \|	diff2 \|	blob \| history