Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

doc/examples/addressbook-sdk/part2/addressbook.ui

@@ -13,8 +13,7 @@
   <property name="windowTitle">
    <string>AddressBook</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <widget class="QWidget" name="">
    <layout class="QGridLayout" name="gridLayout">
     <item row="0" column="0">
      <widget class="QLabel" name="nameEdit">
@@ -40,8 +39,7 @@
      <widget class="QTextEdit" name="textEdit"/>
     </item>
    </layout>
-   </item>
-  </layout>
+  </widget>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>