[drupal-cck/f13/master: 5/5] Merge branch 'master' into f13

[Jon Ciesla]

commit c94c481ad86a774e595d82856f70e9d0e0ddc51a
Merge: 8918aea bfde72d
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Oct 4 08:13:03 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	drupal-cck.spec
    	sources

 drupal-cck.spec |    7 +++++--
 sources         |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---