These are two different events in a believer's life. When we are saved, we recieve the Holy Spirit as Jesus promised in

John 14:16-17 
"I will ask the Father, and He will give you another Helper, that He may be with you forever; that is the Spirit of truth, whom the world cannot receive, because it does not see Him or know Him, but you know Him because He abides with you and will be in you."

This actually came to pass for the apostles after Jesus' resurrection and is recorded in

John 20:21-22 
"So Jesus said to them again, 'Peace be with you; as the Father has sent Me, I also send you.' And when He had said this, He breathed on them and said to them, 'Receive the Holy Spirit'."

But later, He said that the Holy Spirit woulc come UPON them (in power) in

Acts 1:8 
"but you will receive power when the Holy Spirit has come upon you; and you shall be My witnesses both in Jerusalem, and in all Judea and Samaria, and even to the remotest part of the earth."

So recieving the Holy Spirit is when He comes into a person when he is converted or born again, and being baptized in the Holy Spirit is when He comes upon a believer for power or boldness.