merge of '0c6f4fed33f17c5c3b0e7416ecda652fda206d63'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 07:22:21 +0000 (07:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 07:22:21 +0000 (07:22 +0000)
commitf44125b60d426fb5778b5a145e526e2714516646
treedebecb6ad651f9eb36481a9173b9423d660b3498
parent55495249feccc1f7a934524005ea794b5175c077
parentc6a15f8b88644ebfe60d760141fddd94eca36f30
Merge ... '0c6f4fed33f17c5c3b0e7416ecda652fda206d63'
     and 'aa3097d17325c17ff5fe04479d9a3a47ec96d299'