merge of 694969a93c9959459359c6fb14c40eb9a47b0d2f
authorRod Whitby <rod@whitby.id.au>
Sat, 14 Jan 2006 23:30:25 +0000 (23:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 23:30:25 +0000 (23:30 +0000)
commit17fe84319301fcf629f5b47f13053e41919e98b5
tree673a278b3f65c41109d461dcde106b3ac8bbe13b
parentba0e436e16367211db88d291490ab47d73aa1b2c
parentbadb9b7c29c71a1dee23d1ed1ed3ade8cb1089f1
merge of 694969a93c9959459359c6fb14c40eb9a47b0d2f
     and 83739874587da7060ea036057cd64ecfc72a9727