Merge pull request #6686 from stefansaraev/oe
authorMatthias Kortstiege <mkortstiege@users.noreply.github.com>
Fri, 20 Mar 2015 22:40:25 +0000 (23:40 +0100)
committerMatthias Kortstiege <mkortstiege@users.noreply.github.com>
Fri, 20 Mar 2015 22:40:25 +0000 (23:40 +0100)
pick OE patches

1  2 
system/settings/settings.xml

Simple merge