[backfire] merge r24238 & r26785
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 29 Apr 2011 15:15:36 +0000 (15:15 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 29 Apr 2011 15:15:36 +0000 (15:15 +0000)
commit6e172ee269b8ce09dfa5a7d442cdefb7c565d755
tree15c13210932b0f2e0c05eb14367b441a6069e8af
parentde913f66f39d9084a3faf494643b9d981e31206a
[backfire] merge r24238 & r26785

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26786 3c298f89-4303-0410-b956-a3cf2f4a3e73
.gitignore