=== modified file 'sites/all/modules/drupalorg/drupalorg/drupalorg.install'
--- sites/all/modules/drupalorg/drupalorg/drupalorg.install	2012-04-11 20:42:24 +0000
+++ sites/all/modules/drupalorg/drupalorg/drupalorg.install	2012-05-10 01:06:32 +0000
@@ -847,6 +847,43 @@
   return array();
 }
 
+function drupalorg_update_6606() {
+  // Enable feature for project images.
+  // todo
+
+  // Move images to field_project_images.
+  $result = db_query("SELECT ia.nid FROM {image_attach} ia INNER JOIN {node} n ON n.nid = ia.nid AND n.type = 'project_project'");
+  while ($nid = db_result($result)) {
+    $node = node_load($nid);
+    if (!isset($node->field_project_images)) {
+      $node->field_project_images = array();
+    }
+    foreach ($node->iids as $iid) {
+      $image = node_load($iid);
+      $node->field_project_images[] = array(
+        'fid' => db_result(db_query("SELECT fid FROM {image} WHERE nid = %d AND image_size = '_original'", $image->nid)),
+        'list' => 1,
+        'data' => array(
+          'description' => $image->title,
+          'alt' => $image->title,
+          'title' => '',
+        ),
+      );
+      // Remove from image module tracking so deleting the image node will leave
+      // the file intact.
+      db_query("DELETE FROM {image} WHERE nid = %d AND image_size = '_original'", $image->nid);
+      node_delete($image->nid);
+    }
+    unset($node->iids);
+    node_save($node);
+  }
+
+  // Disable image_attach.
+  module_disable(array('image_attach'));
+
+  return array();
+}
+
 /**
  * Utility function to add permissions to certain user roles.
  */

=== modified file 'sites/all/modules/drupalorg/drupalorg/drupalorg.module'
--- sites/all/modules/drupalorg/drupalorg/drupalorg.module	2012-04-12 00:00:14 +0000
+++ sites/all/modules/drupalorg/drupalorg/drupalorg.module	2012-05-10 23:05:08 +0000
@@ -1825,3 +1825,12 @@
   }
   return t('You are not authorized to access this page.');
 }
+
+/**
+ * Only show one attached image on project teaser.
+ */
+function drupalorg_preprocess_content_field(&$v) {
+  if ($v['field']['field_name'] === 'field_project_images' && $v['teaser']) {
+    $v['items'] = array(reset($v['items']));
+  }
+}

=== modified file 'sites/all/themes/bluecheese/styles/layout.css'
--- sites/all/themes/bluecheese/styles/layout.css	2012-03-02 22:06:06 +0000
+++ sites/all/themes/bluecheese/styles/layout.css	2012-05-10 03:25:40 +0000
@@ -145,6 +145,7 @@
   clear: right;
 }
 
+.field-field-project-images,
 .right {
   clear: right;
   float: right;