Merge branch 'master' of git://gitorious.org/~trombonechamp/statusnet/trombonechamps...

diff --cc plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
index 48431195571d02c43212579e7843646af907ae69,71bf33a220a142d806d7e66fd3a424560dc1e912..5b77475c83bddcecbf039e2f13adc7aa1d1a9aff
--- 1/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
--- 2/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
+++ b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php
@@@ -67,12 -63,10 +67,12 @@@ class GNUsocialPhotosPlugin extends Plu
      {
          $schema = Schema::get();
          $schema->ensureTable('GNUsocialPhoto',
-                                 array(new ColumnDef('notice_id', 'int(11)', null, false),
+                                 array(new ColumnDef('notice_id', 'int(11)', null, false, 'PRI'),
                                        new ColumnDef('album_id', 'int(11)', null, false),
                                        new ColumnDef('uri', 'varchar(512)', null, false),
 -                                      new ColumnDef('thumb_uri', 'varchar(512)', null, false)));
 +                                      new ColumnDef('thumb_uri', 'varchar(512)', null, false),
 +                                                                        new ColumnDef('title', 'varchar(512)', null, false),
 +                                                                        new ColumnDef('photo_description', 'text', null, false)));
          $schema->ensureTable('GNUsocialPhotoAlbum',
                                  array(new ColumnDef('album_id', 'int(11)', null, false, 'PRI', null, null, true),
                                        new ColumnDef('profile_id', 'int(11)', null, false),