Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org...
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>
Thu, 14 Jan 2010 19:39:47 +0000 (20:39 +0100)
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>
Thu, 14 Jan 2010 19:39:47 +0000 (20:39 +0100)
commit3fd04f71ad25d5df59c636986f741b9a36ce6501
tree995f4a15764d4196a92ecd966150e38d910d57d1
parentb5b3d83a6f3b1c04a4ebe09f636683ef22495d09
parente426517ed76c7532434f0687f88fca1295530000
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
recipes/mythtv/mythplugins_0.22.bb
recipes/mythtv/myththemes_0.22.bb