am cb08f15b: am ee6df9b4: AI 148870: Pinging Ryan for Dr No approval.   ---   Cloned from CL 147240 by \'g4 patch\'.   Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50.   "Making PDK work in SDK environment."   This CL should be pretty straight forward and should be touching only PDK   related templates, etc. Turns out we no longer need to touch the highlightNav   code.

Merge commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55'

* commit 'cb08f15bf48f070c0bc2925846cd7ef7b1dc4c55':
  AI 148870: Pinging Ryan for Dr No approval.