[oe-commits] Tom Rini : Merge branch '2011.03-maintenance' of git://arago-project.org/ git/people/denix/openembedded into 2011.03-maintenance

[git at git.openembedded.org]

Module: openembedded.git
Branch: 2011.03-maintenance
Commit: 8c37046a587e175931b291e272c93c6d33d548b8
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=8c37046a587e175931b291e272c93c6d33d548b8

Author: Tom Rini <trini at ti.com>
Date:   Mon Jul 30 14:10:22 2012 -0700

Merge branch '2011.03-maintenance' of git://arago-project.org/git/people/denix/openembedded into 2011.03-maintenance

Conflicts:
	recipes/opkg-utils/opkg-utils_git.bb

I had taken a commit that updated opkg-utils slightly, but not enough.
Denys' commit brings everything back into line.

Signed-off-by: Tom Rini <trini at ti.com>

---