Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...
authorFelix Domke <tmbinc@elitedvb.net>
Sun, 26 Oct 2008 23:19:37 +0000 (00:19 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Sun, 26 Oct 2008 23:19:37 +0000 (00:19 +0100)
commitbeafeab72fa51419dabd1c606aa0a432cffd2830
treea13256abba70b22024aef186fad79128ec9cb16e
parent6e46f5a5b1d39931ff46f000dd9151ad8bba5993
parent29d6593ce7b2c793b43bd8709c9a31f89987047a
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into opendreambox

Conflicts:

packages/gstreamer/gst-plugins-ugly_0.10.7.bb
packages/gstreamer/gst-plugins.inc
classes/package.bbclass
conf/checksums.ini
packages/gstreamer/gst-plugins-ugly_0.10.7.bb
packages/gstreamer/gst-plugins.inc