Merge "dos2unix/less/screen/terminology/tree: Social&Content -> System or Platform...

diff --combined git-trees
index 361aa7f,af5c485..4bd5108
--- 1/git-trees
--- 2/git-trees
+++ b/git-trees
@@@ -2101,7 -2101,7 +2101,7 @@@ B: tizen_2.
  B: tizen_2.1
  
  T: external/libflac
 -D: Graphics & UI Framework
 +D: Multimedia
  B: tizen_2.0
  B: tizen_2.1
  B: tizen_2.2
@@@ -2183,7 -2183,7 +2183,7 @@@ B: tizen_2.
  B: tizen_2.2
  
  T: external/libremix
 -D: Graphics & UI Framework
 +D: Multimedia
  B: tizen_2.0
  B: tizen_2.1
  B: tizen_2.2
@@@ -4866,7 -4866,6 +4866,7 @@@ T: kernel/u-boo
  D: Base
  B: tizen_2.0
  B: tizen_2.1
 +B: tizen
  
  T: pkgs/a/alsa-scenario-files-0.0
  D: 
@@@ -8072,7 -8071,7 +8072,7 @@@ D: Platform Developmen
  B: tizen
  
  T: platform/upstream/dos2unix
- D: Social & Content
+ D: System
  B: tizen
  
  T: platform/upstream/dosfstools
@@@ -8981,7 -8980,7 +8981,7 @@@ L: MIT-styl
  L: FSF
  
  T: platform/upstream/less
- D: Social & Content
+ D: System
  B: tizen
  
  T: platform/upstream/leveldb
@@@ -9372,7 -9371,7 +9372,7 @@@ B: tizen_2.
  B: tizen
  
  T: platform/upstream/libflac
 -D: Base
 +D: Multimedia
  B: tizen_2.0
  B: tizen_2.1
  B: tizen
@@@ -9575,7 -9574,7 +9575,7 @@@ L: Public-domai
  L: FSF
  
  T: platform/upstream/libremix
 -D: Base
 +D: Multimedia
  B: tizen_2.0
  B: tizen_2.1
  B: tizen
@@@ -10709,7 -10708,7 +10709,7 @@@ D: Platform Developmen
  B: tizen
  
  T: platform/upstream/screen
- D: Social & Content
+ D: Platform Development
  B: tizen
  
  T: platform/upstream/scrnsaverproto
@@@ -10907,7 -10906,7 +10907,7 @@@ D: Syste
  B: tizen
  
  T: platform/upstream/terminology
- D: Social & Content
+ D: Platform Development
  B: tizen
  
  T: platform/upstream/texinfo
@@@ -10954,7 -10953,7 +10954,7 @@@ B: tize
  L: UnclassifiedLicense
  
  T: platform/upstream/tree
- D: Social & Content
+ D: Platform Development
  B: tizen
  
  T: platform/upstream/tzdata