merge of 4244fcc1342db41f3c990bf797b685be65d4edaa
authorRod Whitby <rod@whitby.id.au>
Tue, 9 Aug 2005 18:00:24 +0000 (18:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Aug 2005 18:00:24 +0000 (18:00 +0000)
commit814e36a4de03f42f9c8291c2d6e68cdadcae8bae
tree407ef49a3939a665596867b7b4d9ca9b6a73eb72
parentf4910c62d20ea08e30eb7600e28bbf4a7daa420d
parent22efe91ae5de78d47bc30d1296b2a61a7fc8a72b
merge of 4244fcc1342db41f3c990bf797b685be65d4edaa
     and a76f350b51bedef01b414ca428726bc656900e86