[oe-commits] Sebastian Spaeth : Merge commit 'origin/shr/merge' into shr/testing2009

[git version control]

Module: openembedded.git
Branch: shr/testing2009
Commit: 74981bb0217ef397f510277351c369bf443cc591
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=74981bb0217ef397f510277351c369bf443cc591

Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Thu Dec 17 15:13:54 2009 +0100

Merge commit 'origin/shr/merge' into shr/testing2009

Conflicts:
	conf/distro/include/sane-srcrevs.inc

Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>

---