[drupal-service_links/f13/master: 3/3] Merge branch 'master' into f13

[Jon Ciesla]

commit 13d69640a7cf27607eae3370f2723faab19beff6
Merge: 8d3dde8 b0b92a2
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Oct 25 14:31:56 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 drupal-service_links.spec |   17 ++++++++++-------
 sources                   |    2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)
---