merge r21187
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 27 Apr 2010 13:08:30 +0000 (13:08 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 27 Apr 2010 13:08:30 +0000 (13:08 +0000)
commit56aeefa4d1863aa99dc49ffa9b876f5f0023b808
tree322fd90e31e01b290ed2b4a42ea11fe241009ecc
parent409f8a9a281331215b31e44dad23cd4556915838
merge r21187

SVN-Revision: 21189