Moving multiple units in an RTS

Hi all

I have the basics for my RTS down, but now I have to approach the behaviour of multiple units.

I'm using the A* pathfinding project and it works great, but when I tell my units to move, they shove each other out of the way when they get to the point, which isn't ideal. They also bump into each other when they're moving towards their destination.

My first thought was to make "bubbles" around the units that they would try to keep clear, but this would create problems with melee.

Could anyone nudge me in the right direction? I tried to find something on the A* website, but I couldn't find what I needed.