[dtaht/Cerowrt-3.3] d287ab: [build]: fix merge conflict

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/dtaht/Cerowrt-3.3
  Commit: d287ab2befac8eac9de1a5a56e832c9fe4f586ec
      https://github.com/dtaht/Cerowrt-3.3/commit/d287ab2befac8eac9de1a5a56e832c9fe4f586ec
  Author: Stephen Walker <stephendwalker+github at gmail.com>
  Date:   2012-06-16 (Sat, 16 Jun 2012)

  Changed paths:
    M Config.in

  Log Message:
  -----------
  [build]: fix merge conflict