Merge branch 'opendreambox-1.6' of git://git.opendreambox.org/git/fraxinas/openembedd...
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 7 Jun 2010 12:52:56 +0000 (14:52 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 7 Jun 2010 12:52:56 +0000 (14:52 +0200)
commitd3e823279d8ff391ddae8b8ba080eb4311c2a0f4
tree788a74783424a771d91493c0dfb6886c1985f9b8
parentf6e002418e8587430d32c101a2b7f46775f40b48
parent2a3d393af53dd856e09b89d8b2f78c8f236d2ec7
Merge branch 'opendreambox-1.6' of git://git.opendreambox.org/git/fraxinas/openembedded into opendreambox-1.6

Conflicts:
recipes/gstreamer/gst-plugins-good_0.10.21.bb
conf/checksums.ini
recipes/gstreamer/gst-plugins-base_0.10.29.bb