Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>
Mon, 2 Mar 2009 18:09:19 +0000 (19:09 +0100)
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>
Mon, 2 Mar 2009 18:09:19 +0000 (19:09 +0100)
commitdd53c790d6c3b19bff547755f804e5f2fccc56ed
tree592f015c44735d719e52f57c86533cbf6981ca14
parent6be41f1374dc9bf7f53673273d8b02bfbfe6a02e
parentb765ebc700bd5b639f70ccf2268284be624f46df
Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev

Conflicts:

classes/qt4e.bbclass
packages/bluez/bluez4_4.31.bb
packages/mc/mc_4.6.2.bb
packages/vte/vte.inc
packages/vte/vte_0.16.13.bb
packages/vte/vte_0.16.14.bb
classes/qt4e.bbclass
conf/distro/include/sane-srcrevs.inc
packages/bluez/bluez4_4.31.bb
packages/vte/vte_0.16.14.bb