merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
authorJustin Patrin <papercrane@gmail.com>
Wed, 8 Feb 2006 21:29:40 +0000 (21:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 21:29:40 +0000 (21:29 +0000)
commitce78c07e9a4e1eaa7b88bab0310f798a32ef0c99
treea7d1d4c1f351d4ef93ab12b79e89f7dcdca96f57
parent19683614e9e4f259a2a17fbf515f001a36a7ad53
parentdcbbfc041e59a98c9d88f4972230c4610af7a96b
merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
     and 7ee355e4a1fa85e49dcae218d1aa5b884f75a6e7