[MERGE] : with main

bzr revid: aja@tinyerp.com-20140117101958-k0zkb3dunl5yjf94

addons/website/data/website_data.xml

@@ -150,11 +150,11 @@
         </record>
 
         <record model="ir.attachment">
-            <field name="name">landscape_tree</field>
-            <field name="datas_fname">landscape_tree.jpg</field>
+            <field name="name">imac</field>
+            <field name="datas_fname">imac.png</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
-            <field name="url">/website/static/src/img/library/landscape_tree.jpg</field>
+            <field name="url">/website/static/src/img/library/imac.png</field>
         </record>
 
         <record model="ir.attachment">
@@ -174,11 +174,11 @@
         </record>
 
         <record model="ir.attachment">
-            <field name="name">personal_laptop</field>
-            <field name="datas_fname">personal_laptop.jpg</field>
+            <field name="name">ipad</field>
+            <field name="datas_fname">ipad.png</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
-            <field name="url">/website/static/src/img/library/personal_laptop.jpg</field>
+            <field name="url">/website/static/src/img/library/ipad.png</field>
         </record>
 
         <record model="ir.attachment">