Grr.. part of Revision 1.34 was erroneously removed in Revision 1.35.  That is not the way to resolve merge conflicts...
Grr.. part of Revision 1.34 was erroneously removed in Revision 1.35.  That
is not the way to resolve merge conflicts...


git-svn-id: 769d22dfa2d22aad706b9a451492fb87c0735f19@15464 08b38cba-cd3b-11de-854e-f91c5b6e4272

vrjuggler/vrjuggler,vancegroup-mirrors/vrjuggler,vancegroup-mirrors/vrjuggler,vancegroup-mirrors/vrjuggler,LiuKeHua/vrjuggler,MichaelMcDonnell/vrjuggler,godbyk/vrjuggler-upstream-old,vrjuggler/vrjuggler,godbyk/vrjuggler-upstream-old,vrjuggler/vrjuggler,LiuKeHua/vrjuggler,LiuKeHua/vrjuggler,vrjuggler/vrjuggler,godbyk/vrjuggler-upstream-old,MichaelMcDonnell/vrjuggler,LiuKeHua/vrjuggler,MichaelMcDonnell/vrjuggler,godbyk/vrjuggler-upstream-old,LiuKeHua/vrjuggler,MichaelMcDonnell/vrjuggler,LiuKeHua/vrjuggler,vrjuggler/vrjuggler,vrjuggler/vrjuggler,MichaelMcDonnell/vrjuggler,LiuKeHua/vrjuggler,MichaelMcDonnell/vrjuggler,vancegroup-mirrors/vrjuggler,godbyk/vrjuggler-upstream-old,vancegroup-mirrors/vrjuggler,vancegroup-mirrors/vrjuggler,vrjuggler/vrjuggler,MichaelMcDonnell/vrjuggler,vrjuggler/vrjuggler,godbyk/vrjuggler-upstream-old,MichaelMcDonnell/vrjuggler,LiuKeHua/vrjuggler