merge of '6a31e37aafc15c89be73dccb95d7e0904e6c22c7'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 11:08:50 +0000 (11:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 11:08:50 +0000 (11:08 +0000)
commit27aa39d20566ff8422bf8b2bd02f62db90bcf1be
tree60d864723a37ba3b0f215b03dd64c67dcb5ed62c
parentd59301b249acf64ca97b1ffe8e6e56a6a03f4c2c
parent63b6a95c46ecabc46ad5ac81ea8ff72897731e82
Merge ... '6a31e37aafc15c89be73dccb95d7e0904e6c22c7'
     and 'd9cd8dcb85fb3fc1b2b6b873d5d6d996da16246f'
packages/openmoko2/openmoko-today2_svn.bb