merge of '5a505039c2ab39aac1ef64bce007b50966455de6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Aug 2007 22:09:07 +0000 (22:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Aug 2007 22:09:07 +0000 (22:09 +0000)
commit6550c898206da5f81bdbab7b8660d2130d6e24b1
tree73929f71a59eea5101071db38385e8635abae1b2
parent856f4fcb8bbdf172f484acbb540a8a8b02fbb631
parent5e47c3777462ce038e98deb198757dd91d33fd33
Merge ... '5a505039c2ab39aac1ef64bce007b50966455de6'
     and '8d5cab38d57a71302b83b51e588b7f781dfb1c41'