[oe-commits] Frans Meulenbroeks : Merge branch 'org.openembedded.dev' of git. openembedded.org:openembedded into org.openembedded.dev

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 3fd04f71ad25d5df59c636986f741b9a36ce6501
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3fd04f71ad25d5df59c636986f741b9a36ce6501

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Thu Jan 14 20:39:47 2010 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

Conflicts:
	recipes/linux/linux-kirkwood_2.6.33-rc1.bb

---