Merging r37946 through r37951 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Jun 2011 18:03:03 +0000 (18:03 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 29 Jun 2011 18:03:03 +0000 (18:03 +0000)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge