Merge commit 'dm/opendreambox-1.6' into test branch
authorschon <schon@dev03-server>
Wed, 13 Apr 2011 11:54:09 +0000 (20:54 +0900)
committerschon <schon@dev03-server>
Wed, 13 Apr 2011 11:54:09 +0000 (20:54 +0900)
commit50e09b44071f9b422d78777695208dfcd1a92029
treeebd0795b83cf9a1b9c01d576a7fd859e47d7d3a3
parenta9cfd92438a1f38f06c528b8ba84077adf940f60
parent7bf50e20c5382ead603b6eb64736a0cba57aaaa6
Merge commit 'dm/opendreambox-1.6' into test branch

Conflicts:
recipes/avahi/avahi.inc
recipes/dbus/dbus.inc
recipes/avahi/avahi.inc
recipes/dbus/dbus.inc
recipes/gstreamer/gst-plugins-bad_0.10.21.bb
recipes/netbase/netbase_4.21.bb