Merge branch 'master' into devel
authorKrisztian Litkey <krisztian.litkey@intel.com>
Tue, 8 May 2012 13:48:55 +0000 (16:48 +0300)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Tue, 8 May 2012 13:48:55 +0000 (16:48 +0300)
commitd8e83132d9b14638c7aaeb76e252a733ed4229bd
tree2873f6999f6797dca1e1da4441809de56afcdfb8
parent5a345b613dc22d0d813e86273523bfb7ea389035
parentd415c120db1d9471c2208e804f260de5746a5a66
Merge branch 'master' into devel