Merge "Fix nested layout issue" into devel/master

diff --cc dali-toolkit/devel-api/layouting/layout-item-impl.h
Simple merge

diff --cc dali-toolkit/devel-api/layouting/layout-parent-impl.h
index a6d76c3a08bc85826f016caa8e613737536d3096,4ce1ab08fe6afb0733d9933c12d646d6d14e71ee..d55fb420e420d53b908fa9d64d51b0b88af6b3d0
--- 1/dali-toolkit/devel-api/layouting/layout-parent-impl.h
--- 2/dali-toolkit/devel-api/layouting/layout-parent-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-parent-impl.h
@@@ -32,9 -30,14 +32,14 @@@ namespace Interna
   * Needed to prevent circular inheritance - most LayoutBases have a parent,
   * but parenting is provided by LayoutGroup, which is a sub-class of LayoutBase.
   */
 -class DALI_IMPORT_API LayoutParent
 +class DALI_TOOLKIT_API LayoutParent
  {
  public:
+   /**
+    * Set the parent of this layout.
+    */
+   virtual void SetParent( LayoutParent* parent ) = 0;
+ 
    /**
     * Get the parent of this layout.
     */